summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-11-30 17:36:13 +0100
committerGünther Deschner <gd@samba.org>2010-11-30 18:13:08 +0100
commit82b440835dfc24be114f08ee1f2824aba7ac7260 (patch)
treea8a193476e823ddb5de3adf162725504ece2aac3
parent2013c9c391ee0324039842ec2f8acd4addd33d85 (diff)
downloadsamba-82b440835dfc24be114f08ee1f2824aba7ac7260.tar.gz
samba-82b440835dfc24be114f08ee1f2824aba7ac7260.tar.bz2
samba-82b440835dfc24be114f08ee1f2824aba7ac7260.zip
s3-waf: convert RPCCLI_DSSETUP into a subsystem.
Guenther
-rw-r--r--source3/wscript_build16
1 files changed, 7 insertions, 9 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index a991f94c2b..5bcbec5f1c 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -74,10 +74,6 @@ LIBCLI_INITSHUTDOWN_SRC = '''
../librpc/gen_ndr/cli_initshutdown.c
../librpc/gen_ndr/ndr_initshutdown_c.c'''
-LIBCLI_DSSETUP_SRC = '''
- ../librpc/gen_ndr/cli_dssetup.c
- ../librpc/gen_ndr/ndr_dssetup_c.c'''
-
LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c
rpc_client/init_lsa.c'''
@@ -465,7 +461,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
WINBINDD_SRC = '''${WINBINDD_SRC1}
${RPC_NCACN_NP} ${NPA_TSTREAM_SRC}
${TDB_VALIDATE_SRC}
- ${LIBCLI_DSSETUP_SRC}
rpc_client/init_netlogon.c
rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c
rpc_server/srv_samr_nt.c ../librpc/gen_ndr/srv_samr.c
@@ -604,7 +599,6 @@ RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
${LIBCLI_NTSVCS_SRC}
${LIBCLI_DRSUAPI_SRC}
${LIBCLI_DFS_SRC}
- ${LIBCLI_DSSETUP_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c'''
@@ -704,7 +698,6 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
${LIBCLI_SPOOLSS_SRC}
${LIBCLI_DRSUAPI_SRC}
${LIBCLI_INITSHUTDOWN_SRC}
- ${LIBCLI_DSSETUP_SRC}
rpc_client/init_netlogon.c
rpc_client/init_samr.c
registry/reg_parse.c registry/reg_format.c
@@ -1185,6 +1178,10 @@ bld.SAMBA_SUBSYSTEM('RPCCLI_SVCCTL',
source='../librpc/gen_ndr/cli_svcctl.c',
public_deps='RPC_NDR_SVCCTL')
+bld.SAMBA_SUBSYSTEM('RPCCLI_DSSETUP',
+ source='../librpc/gen_ndr/cli_dssetup.c',
+ public_deps='RPC_NDR_DSSETUP')
+
bld.SAMBA_SUBSYSTEM('LIBCLI_SAMR',
source=LIBCLI_SAMR_SRC,
deps='RPCCLI_SAMR')
@@ -1227,6 +1224,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
TOKEN_UTIL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
+ RPCCLI_DSSETUP
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
@@ -1249,7 +1247,7 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
LIBADS SMBREADLINE DCUTIL RPCCLI_WINREG RPCCLI_ECHO
RPC_CLIENT_SCHANNEL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
- RPCCLI_SRVSVC RPCCLI_WKSSVC
+ RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_DSSETUP
''',
vars=locals())
@@ -1269,7 +1267,7 @@ bld.SAMBA_BINARY('net',
REGFIO NDR_NTPRINTING RPCCLI_WINREG
RPC_CLIENT_SCHANNEL TOKEN_UTIL
LIBCLI_SAMR LIBCLI_LSA LIBCLI_NETLOGON
- RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL
+ RPCCLI_SRVSVC RPCCLI_WKSSVC RPCCLI_SVCCTL RPCCLI_DSSETUP
''',
vars=locals())