Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

[ira/wip.git] / source4 / lib / util / config.mk

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 3afe398a8f38ae924fce5567b3e19526fad08612..ab6b23dd6ba6738c877ea5fdde5d2a9b5799fbff 100644 (file)
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -1,9 +1,8 @@
 [SUBSYSTEM::LIBSAMBA-UTIL]
 PUBLIC_DEPENDENCIES = \
                LIBTALLOC LIBCRYPTO \
-               SOCKET_WRAPPER EXT_NSL \
-               CHARSET EXECINFO DYNCONFIG \
-               LIBREPLACE_NETWORK
+               SOCKET_WRAPPER LIBREPLACE_NETWORK \
+               CHARSET EXECINFO
 
 LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
        xfile.o \
@@ -23,7 +22,8 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
                ms_fnmatch.o \
                mutex.o \
                idtree.o \
-               become_daemon.o)
+               become_daemon.o \
+               params.o
 
 PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
                                 attr.h \
@@ -33,13 +33,13 @@ PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
                                 mutex.h \
                                 safe_string.h \
                                 time.h \
+                                util_ldb.h \
                                 xfile.h)
 
 [SUBSYSTEM::ASN1_UTIL]
 PRIVATE_PROTO_HEADER = asn1_proto.h
 
 ASN1_UTIL_OBJ_FILES = lib/util/asn1.o
-PUBLIC_HEADERS += lib/util/asn1.h
 
 [SUBSYSTEM::UNIX_PRIVS]
 PRIVATE_PROTO_HEADER = unix_privs.h
@@ -49,7 +49,6 @@ UNIX_PRIVS_OBJ_FILES = lib/util/unix_privs.o
 ################################################
 # Start SUBSYSTEM WRAP_XATTR
 [SUBSYSTEM::WRAP_XATTR]
-PRIVATE_PROTO_HEADER = wrap_xattr.h
 PUBLIC_DEPENDENCIES = XATTR
 #
 # End SUBSYSTEM WRAP_XATTR
@@ -64,7 +63,6 @@ PUBLIC_DEPENDENCIES = LIBTDB
 UTIL_TDB_OBJ_FILES = lib/util/util_tdb.o
 
 [SUBSYSTEM::UTIL_LDB]
-PRIVATE_PROTO_HEADER = util_ldb.h
 PUBLIC_DEPENDENCIES = LIBLDB
 
 UTIL_LDB_OBJ_FILES = lib/util/util_ldb.o