From 9a195fd2330c13b3e9cb4029d41f640e85738d14 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 12 Aug 2010 18:36:16 +0200
Subject: s3-build: only link in dssetup client code where needed.

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

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 0461c24cdf..66a693ae1d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -363,6 +363,9 @@ LIBCLI_ECHO_OBJ = librpc/gen_ndr/cli_echo.o \
 LIBCLI_INITSHUTDOWN_OBJ = librpc/gen_ndr/cli_initshutdown.o \
 			  librpc/gen_ndr/ndr_initshutdown_c.o
 
+LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/cli_dssetup.o \
+		     librpc/gen_ndr/ndr_dssetup_c.o
+
 LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
 		 $(LIBNDR_GEN_OBJ0) \
 		 librpc/gen_ndr/ndr_dfs.o \
@@ -586,7 +589,6 @@ DCERPC_CLIENT_GEN_OBJ = \
 		librpc/gen_ndr/ndr_wkssvc_c.o \
 		librpc/gen_ndr/ndr_netlogon_c.o \
 		librpc/gen_ndr/ndr_samr_c.o \
-		librpc/gen_ndr/ndr_dssetup_c.o \
 		librpc/gen_ndr/ndr_epmapper_c.o
 
 LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
@@ -595,7 +597,6 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
 		   librpc/gen_ndr/cli_wkssvc.o \
 		   librpc/gen_ndr/cli_netlogon.o \
 		   librpc/gen_ndr/cli_samr.o \
-		   librpc/gen_ndr/cli_dssetup.o \
 		   librpc/gen_ndr/cli_epmapper.o \
 		   $(DCERPC_CLIENT_GEN_OBJ) \
 		   ../librpc/rpc/dcerpc_util.o \
@@ -998,7 +999,8 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
 	     $(LIBCLI_NTSVCS_OBJ) \
 	     $(LIBCLI_DRSUAPI_OBJ) \
 	     $(LIBCLI_DFS_OBJ) \
-	     $(LIBCLI_ECHO_OBJ)
+	     $(LIBCLI_ECHO_OBJ) \
+	     $(LIBCLI_DSSETUP_OBJ)
 
 PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
 		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
@@ -1101,7 +1103,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   $(LIBCLI_SPOOLSS_OBJ) \
 	   $(LIBCLI_WINREG_OBJ) \
 	   $(LIBCLI_DRSUAPI_OBJ) \
-	   $(LIBCLI_INITSHUTDOWN_OBJ)
+	   $(LIBCLI_INITSHUTDOWN_OBJ) \
+	   $(LIBCLI_DSSETUP_OBJ)
 
 # these are not processed by make proto
 NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
@@ -1344,7 +1347,8 @@ WINBINDD_OBJ = \
 		$(RPC_NCACN_NP_INTERNAL) $(RPC_SAMR_OBJ) $(RPC_LSA_OBJ) \
 		$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
 		$(LIBADS_SERVER_OBJ) \
-		$(TDB_VALIDATE_OBJ)
+		$(TDB_VALIDATE_OBJ) \
+		$(LIBCLI_DSSETUP_OBJ)
 
 WBINFO_OBJ = ../nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 		$(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
-- 
cgit