git.samba.org / kai / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s4-waf: removed the unused installdir= option to SAMBA_BINARY()
[kai/samba.git] / source4 / librpc / wscript_build
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 66d00ca54473379fa9a2bf2ef85bce3048676d27..f9a5eab185580df125456c752043560b11f8d11e 100644 (file)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -1,11 +1,14 @@
-bld.BUILD_SUBDIR('../../librpc/idl')
-bld.BUILD_SUBDIR('idl')
+#!/usr/bin/env python
+
+bld.RECURSE('../../librpc/idl')
+bld.RECURSE('idl')
 
 bld.SAMBA_LIBRARY('LIBNDR',
        source='ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c',
-       # PC_FILES='../librpc/ndr.pc',
+       pc_files='../../librpc/ndr.pc',
        public_deps='LIBSAMBA-ERRORS talloc LIBSAMBA-UTIL CHARSET LIBSAMBA-HOSTCONFIG',
-       public_headers='../../librpc/ndr/libndr.h PIDL_COMMON/misc.h PIDL_COMMON/ndr_misc.h',
+       public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h ../../librpc/ndr/libndr.h:ndr.h',
+        header_path= [ ( '*gen_ndr*', 'gen_ndr' ) ],
         depends_on='PIDL_MISC',
        vnum='0.0.1'
        )
@@ -14,8 +17,7 @@ bld.SAMBA_LIBRARY('LIBNDR',
 bld.SAMBA_BINARY('ndrdump',
        source='../../librpc/tools/ndrdump.c',
        manpages='../../librpc/tools/ndrdump.1',
-       installdir='BINDIR',
-       deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBPOPT POPT_SAMBA NDR_TABLE LIBSAMBA-ERRORS'
+       deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA NDR_TABLE LIBSAMBA-ERRORS'
        )
 
 
@@ -29,7 +31,8 @@ bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
 bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
        source='../../librpc/gen_ndr/ndr_security.c ../../librpc/ndr/ndr_sec_helper.c gen_ndr/ndr_server_id.c',
        public_deps='LIBNDR LIBSECURITY',
-       public_headers='../libcli/security/security.h gen_ndr/server_id.h'
+       public_headers='../libcli/security/security.h gen_ndr/server_id.h',
+        header_path='gen_ndr'
        )
 
 
@@ -160,7 +163,8 @@ bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS',
 
 
 bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
-       source='../../librpc/ndr/ndr_spoolss_buf.c'
+       source='../../librpc/ndr/ndr_spoolss_buf.c',
+        deps='talloc'
        )
 
 
@@ -293,7 +297,8 @@ bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
 bld.SAMBA_SUBSYSTEM('NDR_NBT',
        source='../../librpc/gen_ndr/ndr_nbt.c',
        public_deps='LIBNDR NDR_NBT_BUF NDR_SECURITY NDR_STANDARD LIBCLI_NDR_NETLOGON',
-       public_headers='../../librpc/gen_ndr/nbt.h'
+       public_headers='../../librpc/gen_ndr/nbt.h',
+        header_path='gen_ndr'
        )
 
 
@@ -322,12 +327,13 @@ bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP',
 
 
 bld.SAMBA_LIBRARY('NDR_STANDARD',
-       source='../../librpc/gen_ndr/ndr_echo.c ../../librpc/gen_ndr/ndr_lsa.c ../../librpc/gen_ndr/ndr_samr.c ../../librpc/ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_netlogon.c ../../libcli/ndr_netlogon.c ../../librpc/gen_ndr/ndr_dfs.c ../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_wkssvc.c ../../librpc/gen_ndr/ndr_srvsvc.c ../../librpc/ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_winreg.c ../../librpc/gen_ndr/ndr_initshutdown.c ../../librpc/gen_ndr/ndr_eventlog.c ../../librpc/gen_ndr/ndr_ntsvcs.c',
+       source='../../librpc/gen_ndr/ndr_echo.c ../../librpc/gen_ndr/ndr_lsa.c ../../librpc/gen_ndr/ndr_samr.c ../../librpc/ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_netlogon.c ../../librpc/gen_ndr/ndr_dfs.c ../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_wkssvc.c ../../librpc/gen_ndr/ndr_srvsvc.c ../../librpc/ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_svcctl.c ../../librpc/gen_ndr/ndr_winreg.c ../../librpc/gen_ndr/ndr_initshutdown.c ../../librpc/gen_ndr/ndr_eventlog.c ../../librpc/gen_ndr/ndr_ntsvcs.c',
        vnum='0.0.1',
-       # PC_FILES='../librpc/ndr_standard.pc',
+       pc_files='../../librpc/ndr_standard.pc',
        deps='NDR_SECURITY',
        public_deps='LIBNDR',
-       public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../rpc_server/lsa/lsa.h ../torture/rpc/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/ndr/ndr_svcctl.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h'
+       public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../rpc_server/lsa/lsa.h ../torture/rpc/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h',
+        header_path='gen_ndr'
        )
 
 
@@ -400,6 +406,12 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSUAPI',
        )
 
 
+bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSBLOBS',
+       source='../../librpc/gen_ndr/ndr_drsblobs_c.c',
+       public_deps='dcerpc NDR_DRSBLOBS'
+       )
+
+
 bld.SAMBA_SUBSYSTEM('RPC_NDR_POLICYAGENT',
        source='../../librpc/gen_ndr/ndr_policyagent_c.c',
        public_deps='dcerpc NDR_POLICYAGENT'
@@ -426,10 +438,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_IRPC',
 
 bld.SAMBA_LIBRARY('dcerpc_samr',
        source='../../librpc/gen_ndr/ndr_samr_c.c',
-       # PC_FILES='dcerpc_samr.pc',
+        pc_files='dcerpc_samr.pc',
        vnum='0.0.1',
        public_deps='dcerpc NDR_STANDARD',
-       public_headers='../../librpc/gen_ndr/ndr_samr_c.h'
+       public_headers='../../librpc/gen_ndr/ndr_samr_c.h',
+        header_path='gen_ndr'
        )
 
 
@@ -454,16 +467,18 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SVCCTL',
        source='../../librpc/gen_ndr/ndr_svcctl_c.c',
        public_deps='dcerpc NDR_STANDARD',
-       public_headers='../../librpc/gen_ndr/ndr_svcctl_c.h'
+       public_headers='../../librpc/gen_ndr/ndr_svcctl_c.h',
+        header_path='gen_ndr'
        )
 
 
 bld.SAMBA_LIBRARY('dcerpc_atsvc',
        source='../../librpc/gen_ndr/ndr_atsvc_c.c',
-       # PC_FILES='dcerpc_atsvc.pc',
+       pc_files='dcerpc_atsvc.pc',
        vnum='0.0.1',
        public_deps='dcerpc NDR_STANDARD',
-       public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h'
+       public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h',
+        header_path='gen_ndr'
        )
 
 
@@ -475,7 +490,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_EVENTLOG',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
        source='../../librpc/gen_ndr/ndr_epmapper_c.c',
-       public_deps='NDR_EPMAPPER'
+       public_deps='tevent NDR_EPMAPPER'
        )
 
 
@@ -517,7 +532,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_INITSHUTDOWN',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
        source='../../librpc/gen_ndr/ndr_mgmt_c.c',
-       deps='NDR_MGMT'
+       deps='tevent NDR_MGMT'
        )
 
 
@@ -584,17 +599,19 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
 bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
        source='../../librpc/gen_ndr/ndr_dcerpc.c',
        public_deps='LIBNDR',
-       public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/ndr_dcerpc.h'
+       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 rpc/dcerpc_connect.c rpc/dcerpc_secondary.c ../../librpc/rpc/binding.c ../../librpc/rpc/dcerpc_error.c',
-       # PC_FILES='dcerpc.pc',
-       deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 LIBNDR NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH LIBCLI_RAW LP_RESOLVE',
+       pc_files='dcerpc.pc',
+       deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 LIBNDR 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',
+       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',
+        header_path='gen_ndr',
        vnum='0.0.1'
        )
 
@@ -718,12 +735,25 @@ bld.SAMBA_PYTHON('python_drsuapi',
        )
 
 
+bld.SAMBA_PYTHON('python_drsblobs',
+       source='../../librpc/gen_ndr/py_drsblobs.c',
+       deps='RPC_NDR_DRSBLOBS PYTALLOC pyparam_util pycredentials python_dcerpc',
+       realname='samba/dcerpc/drsblobs.so'
+       )
+
+
 bld.SAMBA_PYTHON('python_dcerpc_security',
        source='../../librpc/gen_ndr/py_security.c',
        deps='PYTALLOC python_dcerpc_misc python_dcerpc NDR_SECURITY',
        realname='samba/dcerpc/security.so'
        )
 
+bld.SAMBA_PYTHON('python_dcerpc_drsblobs',
+       source='../../librpc/gen_ndr/py_drsblobs.c ../../librpc/gen_ndr/ndr_drsblobs_c.c',
+       deps='PYTALLOC python_dcerpc_misc python_dcerpc NDR_SECURITY',
+       realname='samba/dcerpc/drsblobs.so'
+       )
+
 
 bld.SAMBA_PYTHON('python_dcerpc_xattr',
        source='../../librpc/gen_ndr/py_xattr.c',
@@ -735,3 +765,5 @@ bld.SAMBA_SCRIPT('python_dcerpc_init',
                  pattern='rpc/dcerpc.py',
                  installdir='python/samba/dcerpc',
                  installname='__init__.py')
+
+bld.INSTALL_FILES('${PYTHONDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')
Kai's WIP code