From 562c5999ec636227a3b66bba314481f8367df90a Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 12 Aug 2010 18:58:49 +0200
Subject: s3-build: only link in srvsvc client code where needed.

Guenther
---
 source3/Makefile.in | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'source3')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index bbba5d414ec..85600f7d79e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -372,6 +372,9 @@ LIBCLI_SVCCTL_OBJ = librpc/gen_ndr/cli_svcctl.o \
 LIBCLI_WKSSVC_OBJ = librpc/gen_ndr/cli_wkssvc.o \
 		    librpc/gen_ndr/ndr_wkssvc_c.o
 
+LIBCLI_SRVSVC_OBJ = librpc/gen_ndr/cli_srvsvc.o \
+		    librpc/gen_ndr/ndr_srvsvc_c.o
+
 LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
 		 $(LIBNDR_GEN_OBJ0) \
 		 librpc/gen_ndr/ndr_dfs.o \
@@ -590,13 +593,11 @@ LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
 
 DCERPC_CLIENT_GEN_OBJ = \
 		librpc/gen_ndr/ndr_lsa_c.o \
-		librpc/gen_ndr/ndr_srvsvc_c.o \
 		librpc/gen_ndr/ndr_netlogon_c.o \
 		librpc/gen_ndr/ndr_samr_c.o \
 		librpc/gen_ndr/ndr_epmapper_c.o
 
 LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
-		   librpc/gen_ndr/cli_srvsvc.o \
 		   librpc/gen_ndr/cli_netlogon.o \
 		   librpc/gen_ndr/cli_samr.o \
 		   librpc/gen_ndr/cli_epmapper.o \
@@ -709,7 +710,8 @@ RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
 
 RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \
                  $(LIBCLI_SPOOLSS_OBJ) \
-		 $(LIBCLI_WINREG_OBJ)
+		 $(LIBCLI_WINREG_OBJ) \
+		 $(LIBCLI_SRVSVC_OBJ)
 
 RPC_CLIENT_OBJ = rpc_client/cli_pipe.o \
 		 librpc/rpc/dcerpc_gssapi.o \
@@ -949,7 +951,8 @@ SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
              $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o $(RPC_PARSE_OBJ) \
              $(RPC_CLIENT_OBJ1) \
 	     $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
-	     $(LIBMSRPC_GEN_OBJ)
+	     $(LIBMSRPC_GEN_OBJ) \
+	     $(LIBCLI_SRVSVC_OBJ)
 
 TESTPARM_OBJ = utils/testparm.o \
                $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
@@ -1003,7 +1006,8 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
 	     $(LIBCLI_DFS_OBJ) \
 	     $(LIBCLI_ECHO_OBJ) \
 	     $(LIBCLI_DSSETUP_OBJ) \
-	     $(LIBCLI_WKSSVC_OBJ)
+	     $(LIBCLI_WKSSVC_OBJ) \
+	     $(LIBCLI_SRVSVC_OBJ)
 
 PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
 		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
@@ -1030,7 +1034,8 @@ LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
 		    $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 		    $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 		    $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-		    $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
+		    $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
+		    $(LIBCLI_SRVSVC_OBJ)
 
 LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1)
 
@@ -1054,7 +1059,8 @@ CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	     $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
              $(READLINE_OBJ) $(POPT_LIB_OBJ) \
              $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
-	     $(DISPLAY_SEC_OBJ)
+	     $(DISPLAY_SEC_OBJ) \
+	     $(LIBCLI_SRVSVC_OBJ)
 
 LIBSMBCONF_OBJ = ../lib/smbconf/smbconf.o \
 		 ../lib/smbconf/smbconf_util.o \
@@ -1109,7 +1115,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   $(LIBCLI_INITSHUTDOWN_OBJ) \
 	   $(LIBCLI_DSSETUP_OBJ) \
 	   $(LIBCLI_SVCCTL_OBJ) \
-	   $(LIBCLI_WKSSVC_OBJ)
+	   $(LIBCLI_WKSSVC_OBJ) \
+	   $(LIBCLI_SRVSVC_OBJ)
 
 # these are not processed by make proto
 NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
@@ -2271,7 +2278,8 @@ LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
 		 $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ) \
 		 auth/token_util.o \
 		 $(LIBCLI_INITSHUTDOWN_OBJ) \
-		 $(LIBCLI_WKSSVC_OBJ)
+		 $(LIBCLI_WKSSVC_OBJ) \
+		 $(LIBCLI_SRVSVC_OBJ)
 
 LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
 LIBNETAPI_SOVER=@LIBNETAPI_SOVER@
-- 
cgit