summaryrefslogtreecommitdiff
path: root/source4/librpc
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-02-17 16:19:45 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-02-18 18:41:00 +1100
commit177ddcb084e8f8608bf2012a7c58f7b1e56d2acd (patch)
treefaa113244c96d2cc2803328528291d7c15e962c6 /source4/librpc
parenta493bf9103e5a36e0aef0d1bf1a055f602955d0f (diff)
downloadsamba-177ddcb084e8f8608bf2012a7c58f7b1e56d2acd.tar.gz
samba-177ddcb084e8f8608bf2012a7c58f7b1e56d2acd.tar.bz2
samba-177ddcb084e8f8608bf2012a7c58f7b1e56d2acd.zip
librpc push NDR_SECURITY and NDR_DCERPC to the top level wscript files
There isn't any reson to keep these private to source3 and source4 and more, and doing so creates problems for the top level build. Andrew Bartlett
Diffstat (limited to 'source4/librpc')
-rwxr-xr-xsource4/librpc/wscript_build19
1 files changed, 6 insertions, 13 deletions
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index d263904b02..cecafa8d66 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -4,10 +4,10 @@ bld.RECURSE('../../librpc/idl')
bld.RECURSE('../../librpc/tools')
bld.RECURSE('idl')
-bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
- source='../../librpc/gen_ndr/ndr_security.c ../../librpc/ndr/ndr_sec_helper.c gen_ndr/ndr_server_id.c',
- deps='ndr security',
- public_headers='../../librpc/gen_ndr/security.h gen_ndr/server_id.h',
+bld.SAMBA_SUBSYSTEM('NDR_SERVER_ID4',
+ source='gen_ndr/ndr_server_id.c',
+ deps='ndr',
+ public_headers='gen_ndr/server_id.h',
header_path='gen_ndr'
)
@@ -52,7 +52,7 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB',
bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
source='gen_ndr/ndr_s4_notify.c',
- public_deps='ndr'
+ public_deps='ndr NDR_SERVER_ID4'
)
@@ -159,13 +159,6 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINSIF',
)
-bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
- source='../../librpc/gen_ndr/ndr_dcerpc.c',
- public_deps='ndr',
- public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/ndr_dcerpc.h ../../librpc/gen_ndr/dcerpc.h',
- header_path= [ ('*gen_ndr*', 'gen_ndr') ],
- )
-
bld.SAMBA_LIBRARY('dcerpc',
source='''rpc/dcerpc.c rpc/dcerpc_auth.c rpc/dcerpc_schannel.c
rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c
@@ -176,7 +169,7 @@ bld.SAMBA_LIBRARY('dcerpc',
deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE UTIL_TEVENT',
autoproto='rpc/dcerpc_proto.h',
public_deps='credentials tevent talloc',
- public_headers='../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h',
+ public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h',
header_path='gen_ndr',
vnum='0.0.1'
)