summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-11-30 17:50:32 +0100
committerGünther Deschner <gd@samba.org>2010-11-30 18:13:18 +0100
commit5db1a399d586fd665382e625a5cdd0d1b995df27 (patch)
tree4a5a6f66151f93c54f6bcce0857375ae254facd5
parente80e5c5b8a88a23d3fdf11e52d5f3bef2cdeb31b (diff)
downloadsamba-5db1a399d586fd665382e625a5cdd0d1b995df27.tar.gz
samba-5db1a399d586fd665382e625a5cdd0d1b995df27.tar.bz2
samba-5db1a399d586fd665382e625a5cdd0d1b995df27.zip
s3-waf: convert LIBCLI_SPOOLSS into a subsystem.
Guenther
-rw-r--r--source3/wscript_build22
1 files changed, 12 insertions, 10 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index a3bade353a..d67d9ba09f 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -48,10 +48,7 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
../librpc/ndr/uuid.c
librpc/ndr/util.c'''
-LIBCLI_SPOOLSS_SRC = '''
- ../librpc/gen_ndr/cli_spoolss.c
- ../librpc/gen_ndr/ndr_spoolss_c.c
- rpc_client/cli_spoolss.c
+LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
rpc_client/init_spoolss.c'''
LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c
@@ -497,7 +494,6 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
${RPC_SERVER_SRC}
${OPLOCK_SRC} ${NOTIFY_SRC}
${BUILDOPT_SRC}
- ${LIBCLI_SPOOLSS_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
@@ -569,7 +565,6 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
rpcclient/cmd_winreg.c'''
RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
- ${LIBCLI_SPOOLSS_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
@@ -665,7 +660,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
utils/net_serverid.c
utils/net_eventlog.c
utils/net_printing.c
- ${LIBCLI_SPOOLSS_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c
registry/reg_parse.c registry/reg_format.c
@@ -998,7 +992,7 @@ bld.SAMBA_SUBSYSTEM('SMBD_BASE',
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
PRINTING PRINTBACKEND NDR_XATTR REGFIO
LIBSMBCONF REG_FULL FNAME_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
+ LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
RPCCLI_SRVSVC
''',
vars=locals())
@@ -1175,6 +1169,10 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_EPMAPPER',
source='../librpc/gen_ndr/cli_epmapper.c',
public_deps='RPC_NDR_EPMAPPER')
+bld.SAMBA_SUBSYSTEM('RPCCLI_SPOOLSS',
+ source='../librpc/gen_ndr/cli_spoolss.c',
+ public_deps='RPC_NDR_SPOOLSS')
+
bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
source=LIBCLI_SAMR_SRC,
deps='RPCCLI_SAMR')
@@ -1187,6 +1185,10 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
source=LIBCLI_NETLOGON_SRC,
deps='RPCCLI_NETLOGON')
+bld.SAMBA_SUBSYSTEM('LIBCLI_SPOOLSS',
+ source=LIBCLI_SPOOLSS_SRC,
+ deps='RPCCLI_SPOOLSS')
+
bld.SAMBA_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
source=RPC_CLIENT_SCHANNEL_SRC,
vars=locals())
@@ -1239,7 +1241,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
RPC_CLIENT_SCHANNEL
- LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
+ LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP RPCCLI_DFS
RPCCLI_DRSUAPI RPCCLI_NTSVCS RPCCLI_EVENTLOG
''',
@@ -1260,7 +1262,7 @@ bld.SAMBA_BINARY('net',
LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
REGFIO NDR_NTPRINTING RPCCLI_WINREG
RPC_CLIENT_SCHANNEL TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
+ LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON LIBCLI_SPOOLSS
RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP
RPCCLI_INITSHUTDOWN RPCCLI_DRSUAPI
''',