s3-build: only link in spoolss client code where needed.

Shrinks a lot of binaries by 1 MB each.

Guenther

2 files changed, 16 insertions, 10 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index d80c6c7eee..07349c3f96 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -337,6 +337,11 @@ LIBNDR_PREG_OBJ = librpc/gen_ndr/ndr_preg.o \
 LIBNDR_XATTR_OBJ = librpc/gen_ndr/ndr_xattr.o \
 		   ../librpc/ndr/ndr_xattr.o
 
+LIBCLI_SPOOLSS_OBJ = librpc/gen_ndr/cli_spoolss.o \
+		     librpc/gen_ndr/ndr_spoolss_c.o \
+		     rpc_client/cli_spoolss.o \
+		     rpc_client/init_spoolss.o
+
 LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
 		 $(LIBNDR_GEN_OBJ0) \
 		 librpc/gen_ndr/ndr_dfs.o \
@@ -550,8 +555,6 @@ RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o \
 LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
 	       $(RPC_CLIENT_OBJ1) \
 	       $(RPC_CLIENT_OBJ) \
-	       rpc_client/cli_spoolss.o \
-	       rpc_client/init_spoolss.o \
 	       rpc_client/init_samr.o \
 		   ../librpc/rpc/binding.o
 
@@ -570,8 +573,7 @@ DCERPC_CLIENT_GEN_OBJ = \
 		librpc/gen_ndr/ndr_dssetup_c.o \
 		librpc/gen_ndr/ndr_ntsvcs_c.o \
 		librpc/gen_ndr/ndr_epmapper_c.o \
-		librpc/gen_ndr/ndr_drsuapi_c.o \
-		librpc/gen_ndr/ndr_spoolss_c.o
+		librpc/gen_ndr/ndr_drsuapi_c.o
 
 LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
 		   librpc/gen_ndr/cli_dfs.o \
@@ -588,7 +590,6 @@ LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
 		   librpc/gen_ndr/cli_ntsvcs.o \
 		   librpc/gen_ndr/cli_epmapper.o \
 		   librpc/gen_ndr/cli_drsuapi.o \
-		   librpc/gen_ndr/cli_spoolss.o \
 		   $(DCERPC_CLIENT_GEN_OBJ) \
 		   ../librpc/rpc/dcerpc_util.o \
 		   ../librpc/rpc/binding_handle.o \
@@ -696,7 +697,8 @@ RPC_PIPE_OBJ = rpc_server/srv_pipe.o rpc_server/srv_pipe_hnd.o \
 
 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)
+RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \
+                 $(LIBCLI_SPOOLSS_OBJ)
 
 RPC_CLIENT_OBJ = rpc_client/cli_pipe.o \
 		 librpc/rpc/dcerpc_gssapi.o \
@@ -982,7 +984,8 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
              $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
              $(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
 	     $(LIBADS_OBJ) $(POPT_LIB_OBJ) \
-	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
+	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
+	     $(LIBCLI_SPOOLSS_OBJ)
 
 PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
 		  $(LIBREPLACE_OBJ) @BUILD_INIPARSER@
@@ -1081,7 +1084,8 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   utils/net_eventlog.o \
 	   utils/net_printing.o \
 	   $(LIBNDR_NTPRINTING_OBJ) \
-	   $(LIBNDR_PREG_OBJ)
+	   $(LIBNDR_PREG_OBJ) \
+	   $(LIBCLI_SPOOLSS_OBJ)
 
 
 # these are not processed by make proto
diff --git a/source3/wscript_build b/source3/wscript_build
index c920f4953e..51a88e22c8 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -75,6 +75,10 @@ LIBCLI_SPOOLSS_SRC = '''
                      rpc_client/cli_spoolss.c
                      rpc_client/init_spoolss.c'''
 
+LIBCLI_EVENTLOG_SRC = '''
+                      librpc/gen_ndr/cli_eventlog.c
+                      librpc/gen_ndr/ndr_eventlog_c.c'''
+
 LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ${LIBNDR_GEN_SRC0}
                  ../librpc/gen_ndr/ndr_dfs.c
@@ -305,7 +309,6 @@ DCERPC_CLIENT_GEN_SRC = '''
                 ../librpc/gen_ndr/ndr_svcctl_c.c
                 ../librpc/gen_ndr/ndr_winreg_c.c
                 ../librpc/gen_ndr/ndr_initshutdown_c.c
-                ../librpc/gen_ndr/ndr_eventlog_c.c
                 ../librpc/gen_ndr/ndr_wkssvc_c.c
                 ../librpc/gen_ndr/ndr_netlogon_c.c
                 ../librpc/gen_ndr/ndr_samr_c.c
@@ -321,7 +324,6 @@ LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
                    ../librpc/gen_ndr/cli_svcctl.c
                    ../librpc/gen_ndr/cli_winreg.c
                    ../librpc/gen_ndr/cli_initshutdown.c
-                   ../librpc/gen_ndr/cli_eventlog.c
                    ../librpc/gen_ndr/cli_wkssvc.c
                    ../librpc/gen_ndr/cli_netlogon.c
                    ../librpc/gen_ndr/cli_samr.c