summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-02-05 11:37:53 +0000
committerStefan Metzmacher <metze@samba.org>2004-02-05 11:37:53 +0000
commit6d351569eb3a5c634cdc5e43d1e3059e31a6dfd8 (patch)
tree2bbc5b5d65037017c4d2e8bed2ee2675bbc7e462
parent2853e622483f5f1d2b78e8242bc45168516a44ee (diff)
downloadsamba-6d351569eb3a5c634cdc5e43d1e3059e31a6dfd8.tar.gz
samba-6d351569eb3a5c634cdc5e43d1e3059e31a6dfd8.tar.bz2
samba-6d351569eb3a5c634cdc5e43d1e3059e31a6dfd8.zip
remove unused Makefile vars and fix dublication in $(PROTO_OBJ)
metze (This used to be commit 2173efba143c633fee599b6e188ed7f66b9bb87f)
-rw-r--r--source4/Makefile.in12
1 files changed, 5 insertions, 7 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in
index cce4a4aefb..9dffc1c2f1 100644
--- a/source4/Makefile.in
+++ b/source4/Makefile.in
@@ -209,11 +209,11 @@ PROCESS_MODEL_OBJS = @PROCESS_MODEL_OBJS@
PROCESS_MODEL_LIBS = @PROCESS_MODEL_LIBS@
SMBD_OBJ_BASE = $(PROCESS_MODEL_OBJS) $(SMBD_OBJ_SRV) \
- $(PARAM_OBJ) $(SECRETS_OBJ) $(PASSDB_OBJ) \
- $(AUTH_OBJ) $(LIB_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_OBJ)
+ $(PARAM_OBJ) $(SECRETS_OBJ) \
+ $(LIB_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_OBJ)
SMBD_OBJS = $(SMBD_OBJ_MAIN) $(SMBD_OBJ_BASE) @BUILD_POPT@
-SMBD_LIBS = $(LIBS) $(PROCESS_MODEL_LIBS) $(DCERPC_LIBS) $(AUTH_LIBS) $(PASSDB_LIBS) $(NTVFS_LIBS)
+SMBD_LIBS = $(LIBS) $(SMB_LIBS) $(PROCESS_MODEL_LIBS) $(DCERPC_LIBS) $(AUTH_LIBS) $(PASSDB_LIBS) $(NTVFS_LIBS)
CLIENT_OBJ1 = client/client.o client/clitar.o libcli/raw/clirewrite.o
@@ -247,7 +247,7 @@ GENTEST_OBJ = torture/gentest.o torture/torture_util.o $(LIBSMB_OBJ) $(PARAM_OBJ
MASKTEST_OBJ = torture/masktest.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
$(LIB_OBJ) libcli/raw/clirewrite.o
-LOCKTEST_OBJ = torture/locktest.o $(LOCKING_OBJ) $(LIBSMB_OBJ) $(PARAM_OBJ) \
+LOCKTEST_OBJ = torture/locktest.o $(LIBSMB_OBJ) $(PARAM_OBJ) \
$(LIB_OBJ) libcli/raw/clirewrite.o
NDRDUMP_OBJ = utils/ndrdump.o utils/rewrite.o \
@@ -256,10 +256,8 @@ NDRDUMP_OBJ = utils/ndrdump.o utils/rewrite.o \
PROTO_OBJ = $(SMBD_OBJ_SRV) \
$(SMBD_OBJ_MAIN) $(PROCESS_MODEL_OBJS) \
$(LIBSMB_OBJ) \
- $(LIBRAW_OBJ) $(LIBCLIAUTH_OBJ) \
$(SMBTORTURE_OBJ1) \
- $(AUTH_OBJ) $(PARAM_OBJ) $(SECRETS_OBJ) \
- $(PASSDB_OBJ) \
+ $(PARAM_OBJ) $(SECRETS_OBJ) \
$(READLINE_OBJ) $(CLIENT_OBJ1) \
$(LIB_OBJ) $(POPT_LIB_OBJ)