Merge branch 'master' of ssh://git.samba.org/data/git/samba

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

diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 9ebfbbb7e3fdc8da053a2d9e914e378d32ba449d..0b98dcfa855de942587c486ecba2858d229812d3 100644 (file)
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -4,10 +4,8 @@
 # Start BINARY ntlm_auth
 [BINARY::ntlm_auth]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-               ntlm_auth.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
@@ -15,76 +13,60 @@ PRIVATE_DEPENDENCIES = \
                gensec \
                LIBCLI_RESOLVE \
                auth \
+               ntlm_check \
                MESSAGING \
                LIBEVENTS
 # End BINARY ntlm_auth
 #################################
 
-MANPAGES += utils/man/ntlm_auth.1
+ntlm_auth_OBJ_FILES = $(utilssrcdir)/ntlm_auth.o
+
+MANPAGES += $(utilssrcdir)/man/ntlm_auth.1
 
 #################################
 # Start BINARY getntacl
 [BINARY::getntacl]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-               getntacl.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                NDR_XATTR \
                WRAP_XATTR \
                LIBSAMBA-ERRORS
 
+getntacl_OBJ_FILES = $(utilssrcdir)/getntacl.o
+
 # End BINARY getntacl
 #################################
 
-MANPAGES += utils/man/getntacl.1
+MANPAGES += $(utilssrcdir)/man/getntacl.1
 
 #################################
 # Start BINARY setntacl
 [BINARY::setntacl]
 # disabled until rewritten
 #INSTALLDIR = BINDIR
-OBJ_FILES = \
-               setntacl.o
 # End BINARY setntacl
 #################################
 
+setntacl_OBJ_FILES = $(utilssrcdir)/setntacl.o
+
 #################################
 # Start BINARY setnttoken
 [BINARY::setnttoken]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-               setnttoken.o
 PRIVATE_DEPENDENCIES =
 # End BINARY setnttoken
 #################################
 
-#################################
-# Start BINARY nmblookup
-[BINARY::nmblookup]
-INSTALLDIR = BINDIR
-OBJ_FILES = \
-               nmblookup.o
-PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
-               LIBSAMBA-UTIL \
-               LIBCLI_NBT \
-               LIBPOPT \
-               POPT_SAMBA \
-               LIBNETIF \
-               LIBCLI_RESOLVE
-# End BINARY nmblookup
-#################################
+setnttoken_OBJ_FILES = $(utilssrcdir)/setnttoken.o
 
 #################################
 # Start BINARY testparm
 [BINARY::testparm]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-               testparm.o
 PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                samba-socket \
@@ -93,3 +75,33 @@ PRIVATE_DEPENDENCIES = \
                CHARSET
 # End BINARY testparm
 #################################
+
+testparm_OBJ_FILES = $(utilssrcdir)/testparm.o
+
+################################################
+# Start BINARY oLschema2ldif
+[BINARY::oLschema2ldif]
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
+               LIBLDB_CMDLINE SAMDB
+# End BINARY oLschema2ldif
+################################################
+
+
+oLschema2ldif_OBJ_FILES = $(addprefix $(utilssrcdir)/, oLschema2ldif.o)
+
+MANPAGES += $(utilssrcdir)/man/oLschema2ldif.1
+
+################################################
+# Start BINARY  ad2oLschema
+[BINARY::ad2oLschema]
+INSTALLDIR = BINDIR
+PRIVATE_DEPENDENCIES = \
+               LIBLDB_CMDLINE SAMDB 
+# End BINARY ad2oLschema
+################################################
+
+ad2oLschema_OBJ_FILES = $(addprefix $(utilssrcdir)/, ad2oLschema.o)
+
+MANPAGES += $(utilssrcdir)/man/ad2oLschema.1
+