Merge v4.0-test

[sfrench/samba-autobuild/.git] / source4 / lib / util / config.mk

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 22e6617f7cb0df2fb870bedd6bdc30269dea1271..3afe398a8f38ae924fce5567b3e19526fad08612 100644 (file)
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -1,7 +1,12 @@
 [SUBSYSTEM::LIBSAMBA-UTIL]
-#VERSION = 0.0.1
-#SO_VERSION = 0
-OBJ_FILES = xfile.o \
+PUBLIC_DEPENDENCIES = \
+               LIBTALLOC LIBCRYPTO \
+               SOCKET_WRAPPER EXT_NSL \
+               CHARSET EXECINFO DYNCONFIG \
+               LIBREPLACE_NETWORK
+
+LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
+       xfile.o \
                debug.o \
                fault.o \
                signal.o \
@@ -18,11 +23,7 @@ OBJ_FILES = xfile.o \
                ms_fnmatch.o \
                mutex.o \
                idtree.o \
-               become_daemon.o
-PUBLIC_DEPENDENCIES = \
-               LIBTALLOC LIBCRYPTO \
-               SOCKET_WRAPPER LIBREPLACE_NETWORK \
-               CHARSET EXECINFO
+               become_daemon.o)
 
 PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
                                 attr.h \
@@ -36,33 +37,34 @@ PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
 
 [SUBSYSTEM::ASN1_UTIL]
 PRIVATE_PROTO_HEADER = asn1_proto.h
-OBJ_FILES = asn1.o
 
+ASN1_UTIL_OBJ_FILES = lib/util/asn1.o
 PUBLIC_HEADERS += lib/util/asn1.h
 
 [SUBSYSTEM::UNIX_PRIVS]
 PRIVATE_PROTO_HEADER = unix_privs.h
-OBJ_FILES = unix_privs.o
+
+UNIX_PRIVS_OBJ_FILES = lib/util/unix_privs.o
 
 ################################################
 # Start SUBSYSTEM WRAP_XATTR
 [SUBSYSTEM::WRAP_XATTR]
 PRIVATE_PROTO_HEADER = wrap_xattr.h
-OBJ_FILES = \
-               wrap_xattr.o
 PUBLIC_DEPENDENCIES = XATTR
 #
 # End SUBSYSTEM WRAP_XATTR
 ################################################
 
+WRAP_XATTR_OBJ_FILES = lib/util/wrap_xattr.o
+
 [SUBSYSTEM::UTIL_TDB]
 PRIVATE_PROTO_HEADER = util_tdb.h
-OBJ_FILES = \
-               util_tdb.o
 PUBLIC_DEPENDENCIES = LIBTDB
 
+UTIL_TDB_OBJ_FILES = lib/util/util_tdb.o
+
 [SUBSYSTEM::UTIL_LDB]
 PRIVATE_PROTO_HEADER = util_ldb.h
-OBJ_FILES = \
-                       util_ldb.o
 PUBLIC_DEPENDENCIES = LIBLDB
+
+UTIL_LDB_OBJ_FILES = lib/util/util_ldb.o