summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-14 17:22:58 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-14 17:22:58 +0200
commite9017ba418202b4b191c5a9ad4a96857558ce606 (patch)
tree7a5069a59fde6de060a8946fa1b04a22333b3078 /source4/utils
parentffc5cbfe803326a1c3bf55684717af910d091c5a (diff)
downloadsamba-e9017ba418202b4b191c5a9ad4a96857558ce606.tar.gz
samba-e9017ba418202b4b191c5a9ad4a96857558ce606.tar.bz2
samba-e9017ba418202b4b191c5a9ad4a96857558ce606.zip
Use _OBJ_FILES variables in a couple more places.
(This used to be commit 92856d5054106894b65cd1a1b5119c0facfc4cff)
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/config.mk24
-rw-r--r--source4/utils/net/config.mk16
2 files changed, 21 insertions, 19 deletions
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 9dea2c5af3..a7d82684e4 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -4,8 +4,6 @@
# Start BINARY ntlm_auth
[BINARY::ntlm_auth]
INSTALLDIR = BINDIR
-OBJ_FILES = \
- ntlm_auth.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG \
LIBSAMBA-UTIL \
@@ -20,14 +18,14 @@ PRIVATE_DEPENDENCIES = \
# 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
PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG \
LIBSAMBA-UTIL \
@@ -35,6 +33,8 @@ PRIVATE_DEPENDENCIES = \
WRAP_XATTR \
LIBSAMBA-ERRORS
+getntacl_OBJ_FILES = utils/getntacl.o
+
# End BINARY getntacl
#################################
@@ -45,27 +45,25 @@ MANPAGES += utils/man/getntacl.1
[BINARY::setntacl]
# disabled until rewritten
#INSTALLDIR = BINDIR
-OBJ_FILES = \
- setntacl.o
# End BINARY setntacl
#################################
+setntacl_OBJ_FILES = utils/setntacl.o
+
#################################
# Start BINARY setnttoken
[BINARY::setnttoken]
INSTALLDIR = BINDIR
-OBJ_FILES = \
- setnttoken.o
PRIVATE_DEPENDENCIES =
# End BINARY setnttoken
#################################
+setnttoken_OBJ_FILES = utils/setnttoken.o
+
#################################
# Start BINARY nmblookup
[BINARY::nmblookup]
INSTALLDIR = BINDIR
-OBJ_FILES = \
- nmblookup.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG \
LIBSAMBA-UTIL \
@@ -77,12 +75,12 @@ PRIVATE_DEPENDENCIES = \
# End BINARY nmblookup
#################################
+nmblookup_OBJ_FILES = utils/nmblookup.o
+
#################################
# Start BINARY testparm
[BINARY::testparm]
INSTALLDIR = BINDIR
-OBJ_FILES = \
- testparm.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG \
LIBSAMBA-UTIL \
@@ -93,3 +91,5 @@ PRIVATE_DEPENDENCIES = \
CHARSET
# End BINARY testparm
#################################
+
+testparm_OBJ_FILES = utils/testparm.o
diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk
index ced0710ae0..4423c44c15 100644
--- a/source4/utils/net/config.mk
+++ b/source4/utils/net/config.mk
@@ -5,13 +5,6 @@
[BINARY::net]
INSTALLDIR = BINDIR
PRIVATE_PROTO_HEADER = net_proto.h
-OBJ_FILES = \
- net.o \
- net_password.o \
- net_time.o \
- net_join.o \
- net_vampire.o \
- net_user.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG \
LIBSAMBA-UTIL \
@@ -21,3 +14,12 @@ PRIVATE_DEPENDENCIES = \
POPT_CREDENTIALS
# End BINARY net
#################################
+
+net_OBJ_FILES = $(addprefix utils/net/, \
+ net.o \
+ net_password.o \
+ net_time.o \
+ net_join.o \
+ net_vampire.o \
+ net_user.o)
+