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

Shrinks a lot of binaries by 1 MB each.

Guenther

diff --git a/source3/wscript_build b/source3/wscript_build
index 528b124af64b31e5de2942f914c51c6e7af42751..c920f4953e630056ebdc853eab906cc2884bd393 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -69,6 +69,12 @@ LIBNDR_SPOOLSS_SRC = '''../librpc/gen_ndr/ndr_spoolss.c
 LIBNDR_XATTR_SRC = '''../librpc/gen_ndr/ndr_xattr.c
                   ../librpc/ndr/ndr_xattr.c'''
 
+LIBCLI_SPOOLSS_SRC = '''
+                     librpc/gen_ndr/cli_spoolss.c
+                     librpc/gen_ndr/ndr_spoolss_c.c
+                     rpc_client/cli_spoolss.c
+                     rpc_client/init_spoolss.c'''
+
 LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ${LIBNDR_GEN_SRC0}
                  ../librpc/gen_ndr/ndr_dfs.c
@@ -288,8 +294,6 @@ RPC_CLIENT_SRC1 = '''rpc_client/cli_netlogon.c
 LIBMSRPC_SRC = '''rpc_client/cli_lsarpc.c rpc_client/cli_samr.c
                ${RPC_CLIENT_SRC1}
                ${RPC_CLIENT_SRC}
-               rpc_client/cli_spoolss.c
-               rpc_client/init_spoolss.c
                rpc_client/init_samr.c
                    ../librpc/rpc/binding.c'''
 
@@ -308,8 +312,7 @@ DCERPC_CLIENT_GEN_SRC = '''
                 ../librpc/gen_ndr/ndr_dssetup_c.c
                 ../librpc/gen_ndr/ndr_ntsvcs_c.c
                 ../librpc/gen_ndr/ndr_epmapper_c.c
-                ../librpc/gen_ndr/ndr_drsuapi_c.c
-                ../librpc/gen_ndr/ndr_spoolss_c.c'''
+                ../librpc/gen_ndr/ndr_drsuapi_c.c'''
 
 LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
                    ../librpc/gen_ndr/cli_dfs.c
@@ -326,7 +329,6 @@ LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
                    ../librpc/gen_ndr/cli_ntsvcs.c
                    ../librpc/gen_ndr/cli_epmapper.c
                    ../librpc/gen_ndr/cli_drsuapi.c
-                   ../librpc/gen_ndr/cli_spoolss.c
                    ${DCERPC_CLIENT_GEN_SRC}
                    ../librpc/rpc/dcerpc_util.c
                    librpc/rpc/dcerpc_helpers.c
@@ -766,6 +768,7 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${RPC_SVCCTL_SRC} ${RPC_NTSVCS_SRC} ${RPC_DFS_SRC}
                 ${RPC_SPOOLSS_SRC} ${RPC_EVENTLOG_SRC}
                 ${RPC_ECHO_SRC}
+                ${LIBCLI_SPOOLSS_SRC}
                 ${AUTH_SRC}
                 ${PRIVILEGES_BASIC_SRC}'''