From 996bcb55a82398a02f0484ef29e2de37c2949e7c Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 3 Dec 2000 02:15:58 +0000
Subject: split the RPC_PARSE object into two pieces. The first is included as
 part of LIBSMB and the latter is used by parts of samba that know about the
 pwd backends (This used to be commit
 3420b52da5957b5bbf0704d1e386349a061f86cf)

---
 source3/Makefile.in | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index b5ba9b481b..c641693a66 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -119,11 +119,11 @@ PARAM_OBJ = param/loadparm.o param/params.o
 LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     libsmb/clirap.o libsmb/clierror.o libsmb/climessage.o \
 	     libsmb/clireadwrite.o libsmb/clilist.o libsmb/cliprint.o \
-	     libsmb/clitrans.o \
+	     libsmb/clitrans.o libsmb/clisecdesc.o \
 	     libsmb/namequery.o libsmb/nmblib.o \
              libsmb/nterr.o libsmb/smbdes.o libsmb/smbencrypt.o \
              libsmb/smberr.o libsmb/credentials.o libsmb/pwd_cache.o \
-	     libsmb/passchange.o libsmb/unexpected.o
+	     libsmb/passchange.o libsmb/unexpected.o $(RPC_PARSE_OBJ1)
 
 RPC_SERVER_OBJ = rpc_server/srv_lsa.o \
                  rpc_server/srv_lsa_hnd.o rpc_server/srv_netlog.o \
@@ -133,11 +133,14 @@ RPC_SERVER_OBJ = rpc_server/srv_lsa.o \
                  rpc_server/srv_pipe.o rpc_server/srv_dfs.o \
 		 rpc_server/srv_spoolss.o rpc_server/srv_spoolss_nt.o
 
-RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_misc.o \
-                rpc_parse/parse_net.o rpc_parse/parse_prs.o \
+RPC_PARSE_OBJ1 = rpc_parse/parse_prs.o rpc_parse/parse_sec.o \
+		 rpc_parse/parse_misc.o
+
+RPC_PARSE_OBJ = $(RPC_PARSE_OBJ1) \
+		rpc_parse/parse_lsa.o rpc_parse/parse_net.o \
                 rpc_parse/parse_reg.o rpc_parse/parse_rpc.o \
                 rpc_parse/parse_samr.o rpc_parse/parse_srv.o \
-                rpc_parse/parse_wks.o rpc_parse/parse_sec.o \
+                rpc_parse/parse_wks.o \
 		rpc_parse/parse_spoolss.o rpc_parse/parse_dfs.o \
 		rpc_parse/parse_creds.o
 
@@ -299,6 +302,10 @@ LOCKTEST_OBJ = utils/locktest.o $(LOCKING_OBJ) $(LIBSMB_OBJ) $(PARAM_OBJ) \
                  $(UBIQX_OBJ) $(LIB_OBJ)
 
 
+SMBCACLS_OBJ = utils/smbcacls.o $(LOCKING_OBJ) $(LIBSMB_OBJ) $(PARAM_OBJ) \
+                 $(UBIQX_OBJ) $(LIB_OBJ)
+
+
 LOCKTEST2_OBJ = utils/locktest2.o $(LOCKING_OBJ) $(LIBSMB_OBJ) $(PARAM_OBJ) \
                  $(UBIQX_OBJ) $(LIB_OBJ)
 
@@ -367,6 +374,8 @@ msgtest : CHECK bin/msgtest
 
 locktest : CHECK bin/locktest
 
+smbcacls : CHECK bin/smbcacls
+
 locktest2 : CHECK bin/locktest2
 
 rpctorture : CHECK bin/rpctorture
@@ -524,6 +533,10 @@ bin/msgtest: $(MSGTEST_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(LIBS)
 
+bin/smbcacls: $(SMBCACLS_OBJ) bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(LDFLAGS) $(LIBS)
+
 bin/locktest: $(LOCKTEST_OBJ) bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(LIBS)
-- 
cgit