summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerb Lewis <herb@samba.org>2008-07-07 12:44:13 -0700
committerMichael Adam <obnox@samba.org>2008-08-12 22:01:02 +0200
commit9caabc441b3bfe860f9719cf64b6646f58a5cb59 (patch)
tree8b6e49ab94e4c7acf4e22c398531c6a22d770db0
parent743d6f707a7dcd31f8d0cf1685275d179c0d5169 (diff)
downloadsamba-9caabc441b3bfe860f9719cf64b6646f58a5cb59.tar.gz
samba-9caabc441b3bfe860f9719cf64b6646f58a5cb59.tar.bz2
samba-9caabc441b3bfe860f9719cf64b6646f58a5cb59.zip
use variables for files used in multiple places
(cherry picked from commit cee044bc42d955c535dbb6bb372af01089d37756) (This used to be commit 2462562b5c90bc1c46237cd980810b0a69cd116d)
-rw-r--r--source3/Makefile.in36
1 files changed, 19 insertions, 17 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6b2abaf8d1..c4354b46dc 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -269,16 +269,20 @@ LIBNDR_OBJ = librpc/ndr/ndr_basic.o \
RPCCLIENT_NDR_OBJ = rpc_client/ndr.o
+LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
+ librpc/gen_ndr/ndr_lsa.o
+
+LIBNDR_GEN_OBJ1 = librpc/gen_ndr/ndr_netlogon.o
+
LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
- librpc/gen_ndr/ndr_lsa.o \
+ $(LIBNDR_GEN_OBJ0) \
librpc/gen_ndr/ndr_dfs.o \
librpc/gen_ndr/ndr_echo.o \
librpc/gen_ndr/ndr_winreg.o \
librpc/gen_ndr/ndr_initshutdown.o \
librpc/gen_ndr/ndr_srvsvc.o \
librpc/gen_ndr/ndr_eventlog.o \
- librpc/gen_ndr/ndr_netlogon.o \
- librpc/gen_ndr/ndr_samr.o \
+ $(LIBNDR_GEN_OBJ1) \
librpc/gen_ndr/ndr_dssetup.o \
librpc/gen_ndr/ndr_notify.o \
librpc/gen_ndr/ndr_xattr.o \
@@ -701,7 +705,7 @@ NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
NMBD_OBJ = $(NMBD_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o web/statuspage.o \
web/swat.o web/neg_lang.o
@@ -873,7 +877,7 @@ NET_OBJ = $(NET_OBJ1) \
CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
CIFS_MOUNT_OBJ = client/mount.cifs.o
@@ -889,28 +893,28 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/uta
SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
MASKTEST_OBJ = torture/masktest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
MSGTEST_OBJ = torture/msgtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
LOCKTEST_OBJ = torture/locktest.o $(PARAM_OBJ) $(LOCKING_OBJ) $(KRBCLIENT_OBJ) \
$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) @LIBWBCLIENT_STATIC@ $(GROUPDB_OBJ) \
$(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ)
@@ -920,7 +924,7 @@ LOG2PCAP_OBJ = utils/log2pcaphex.o
LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
@@ -962,11 +966,11 @@ DEBUG2HTML_OBJ = utils/debug2html.o utils/debugparse.o
SMBFILTER_OBJ = utils/smbfilter.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
$(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) $(NSSWINS_OBJ) $(KRBCLIENT_OBJ) \
- librpc/gen_ndr/ndr_samr.o librpc/gen_ndr/ndr_lsa.o
+ $(LIBNDR_GEN_OBJ0)
PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
pam_smbpass/pam_smb_acct.o pam_smbpass/support.o
@@ -1082,9 +1086,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
$(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(SMBLDAP_OBJ) $(LIBNMB_OBJ) \
$(LDB_OBJ) $(WBCOMMON_OBJ) @LIBWBCLIENT_STATIC@ \
- librpc/gen_ndr/ndr_samr.o \
- librpc/gen_ndr/ndr_lsa.o \
- librpc/gen_ndr/ndr_netlogon.o
+ $(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1)
VLP_OBJ1 = ../testsuite/printing/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2) $(RPC_CLIENT_OBJ) librpc/rpc/binding.o