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

[kai/samba.git] / source4 / utils / config.mk

diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 860d2c73a1544ab440276d2de44c1e71046f2ffc..a7d82684e4305f232943251d2969374576b1a70b 100644 (file)
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -1,89 +1,95 @@
 # utils subsystem
 
-#################################
-# Start BINARY ndrdump
-[BINARY::ndrdump]
-INSTALLDIR = BINDIR
-OBJ_FILES = \
-               ndrdump.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG \
-               LIBBASIC \
-               NDR_ALL \
-               LIBPOPT \
-               POPT_SAMBA
-MANPAGE = man/ndrdump.1
-# FIXME: ndrdump shouldn't have to depend on RPC...
-# End BINARY ndrdump
-#################################
-
 #################################
 # Start BINARY ntlm_auth
 [BINARY::ntlm_auth]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-               ntlm_auth.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG \
-               LIBBASIC \
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-HOSTCONFIG \
+               LIBSAMBA-UTIL \
                LIBPOPT \
-               POPT_SAMBA
-MANPAGE = man/ntlm_auth.1
+               POPT_SAMBA \
+               POPT_CREDENTIALS \
+               gensec \
+               LIBCLI_RESOLVE \
+               auth \
+               MESSAGING \
+               LIBEVENTS
 # End BINARY ntlm_auth
 #################################
 
+ntlm_auth_OBJ_FILES = utils/ntlm_auth.o
+
+MANPAGES += utils/man/ntlm_auth.1
+
 #################################
 # Start BINARY getntacl
 [BINARY::getntacl]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-               getntacl.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG \
-               LIBBASIC \
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-HOSTCONFIG \
+               LIBSAMBA-UTIL \
                NDR_XATTR \
-               EXT_LIB_XATTR
+               WRAP_XATTR \
+               LIBSAMBA-ERRORS
+
+getntacl_OBJ_FILES = utils/getntacl.o
+
 # End BINARY getntacl
 #################################
 
+MANPAGES += utils/man/getntacl.1
+
 #################################
 # Start BINARY setntacl
 [BINARY::setntacl]
-INSTALLDIR = BINDIR
-OBJ_FILES = \
-               setntacl.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG \
-               LIBBASIC \
-               NDR_XATTR
+# disabled until rewritten
+#INSTALLDIR = BINDIR
 # End BINARY setntacl
 #################################
 
+setntacl_OBJ_FILES = utils/setntacl.o
+
 #################################
 # Start BINARY setnttoken
 [BINARY::setnttoken]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-               setnttoken.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG \
-               LIBBASIC \
-               NDR_XATTR \
-               NDR_SAMR
+PRIVATE_DEPENDENCIES =
 # End BINARY setnttoken
 #################################
 
+setnttoken_OBJ_FILES = utils/setnttoken.o
+
 #################################
 # Start BINARY nmblookup
 [BINARY::nmblookup]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-               nmblookup.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG \
-               LIBBASIC \
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-HOSTCONFIG \
+               LIBSAMBA-UTIL \
                LIBCLI_NBT \
                LIBPOPT \
-               POPT_SAMBA
+               POPT_SAMBA \
+               LIBNETIF \
+               LIBCLI_RESOLVE
 # End BINARY nmblookup
 #################################
+
+nmblookup_OBJ_FILES = utils/nmblookup.o
+
+#################################
+# Start BINARY testparm
+[BINARY::testparm]
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-HOSTCONFIG \
+               LIBSAMBA-UTIL \
+               LIBPOPT \
+               samba-socket \
+               POPT_SAMBA \
+               LIBCLI_RESOLVE \
+               CHARSET
+# End BINARY testparm
+#################################
+
+testparm_OBJ_FILES = utils/testparm.o