build: Add missing deps and make MESSAGING a private library
[samba.git] / source4 / librpc / wscript_build
index 10096c4e41f21fcd0a9874483718e84d94d2ca0d..494ff1237c5f898a01c7fe54ce0bb61d34110cc8 100755 (executable)
@@ -1,34 +1,9 @@
 #!/usr/bin/env python
 
 bld.RECURSE('../../librpc/idl')
+bld.RECURSE('../../librpc/tools')
 bld.RECURSE('idl')
 
-bld.SAMBA_LIBRARY('ndr',
-       source='../../librpc/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',
-       public_deps='errors talloc samba-util',
-       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'
-       )
-
-
-bld.SAMBA_BINARY('ndrdump',
-       source='../../librpc/tools/ndrdump.c',
-       manpages='../../librpc/tools/ndrdump.1',
-       deps='samba-hostconfig samba-util popt POPT_SAMBA ndr-table errors'
-       )
-
-
-
-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',
-       header_path='gen_ndr'
-       )
-
 
 bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
        source='gen_ndr/ndr_winstation.c',
@@ -38,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
 
 bld.SAMBA_SUBSYSTEM('NDR_IRPC',
        source='gen_ndr/ndr_irpc.c',
-       public_deps='ndr NDR_SECURITY NDR_NBT'
+       public_deps='ndr NDR_SECURITY ndr_nbt'
        )
 
 
@@ -68,12 +43,6 @@ bld.SAMBA_SUBSYSTEM('NDR_OPENDB',
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
-       source='gen_ndr/ndr_s4_notify.c',
-       public_deps='ndr'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND',
        source='gen_ndr/ndr_ntp_signd.c',
        public_deps='ndr'
@@ -82,7 +51,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND',
 
 bld.SAMBA_SUBSYSTEM('NDR_WINSREPL',
        source='gen_ndr/ndr_winsrepl.c',
-       public_deps='ndr NDR_NBT'
+       public_deps='ndr ndr_nbt'
        )
 
 
@@ -91,23 +60,10 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
        public_deps='NDR_IDMAP ndr ndr-standard'
        )
 
-
-bld.SAMBA_LIBRARY('ndr-standard',
-       source='../../librpc/gen_ndr/ndr_atsvc.c ../../librpc/gen_ndr/ndr_eventlog6.c',
-       vnum='0.0.1',
-       pc_files='../../librpc/ndr_standard.pc',
-       deps='''NDR_SECURITY NDR_LSA NDR_SAMR NDR_NETLOGON NDR_EVENTLOG NDR_DFS
-       NDR_NTSVCS NDR_SVCCTL NDR_INITSHUTDOWN NDR_WKSSVC NDR_SRVSVC NDR_WINREG
-       NDR_ECHO security NDR_DNS''',
-       public_deps='ndr',
-       public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../../librpc/gen_ndr/lsa.h ../../librpc/gen_ndr/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'
-       )
-
 # create a grouping library to consolidate our samba4 specific NDR code
 bld.SAMBA_LIBRARY('ndr-samba4',
        source=[],
-       deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB NDR_NOTIFY ndr-table',
+       deps='NDR_WINBIND NDR_IRPC NDR_NFS4ACL NDR_OPENDB ndr-table',
        private_library=True,
        grouping_library=True
        )
@@ -128,14 +84,14 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
         public_deps='''ndr-standard NDR_AUDIOSRV NDR_DSBACKUP NDR_EFS
         NDR_DRSUAPI NDR_POLICYAGENT NDR_UNIXINFO NDR_SPOOLSS NDR_EPMAPPER
         NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINSIF NDR_MGMT
-        NDR_PROTECTED_STORAGE NDR_OXIDRESOLVER NDR_REMACT NDR_WZCSVC
-        NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_TRKWKS NDR_KEYSVC NDR_KRB5PAC
-        NDR_XATTR NDR_SCHANNEL NDR_ROT NDR_DRSBLOBS NDR_NBT NDR_WINSREPL
+        NDR_OXIDRESOLVER NDR_REMACT NDR_WZCSVC
+        NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_TRKWKS NDR_KEYSVC ndr-krb5pac
+        NDR_XATTR NDR_SCHANNEL NDR_ROT NDR_DRSBLOBS ndr_nbt NDR_WINSREPL
         NDR_SECURITY NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_OPENDB
         NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
         NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI
         NDR_NAMED_PIPE_AUTH NDR_NTLMSSP NDR_DFSBLOBS NDR_DNSP
-        NDR_NTPRINTING NDR_DNS''',
+        NDR_NTPRINTING NDR_DNS NDR_BACKUPKEY NDR_PREG NDR_WBINT''',
         depends_on='GEN_NDR_TABLES'
         )
 
@@ -152,20 +108,20 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_WINBIND',
 
 
 bld.SAMBA_LIBRARY('dcerpc-samr',
-       source='../../librpc/gen_ndr/ndr_samr_c.c',
+       source='',
        pc_files='dcerpc_samr.pc',
        vnum='0.0.1',
-       public_deps='dcerpc ndr-standard',
+       public_deps='dcerpc ndr-standard RPC_NDR_SAMR',
        public_headers='../../librpc/gen_ndr/ndr_samr_c.h',
        header_path='gen_ndr'
        )
 
 
 bld.SAMBA_LIBRARY('dcerpc-atsvc',
-       source='../../librpc/gen_ndr/ndr_atsvc_c.c',
+       source='',
        pc_files='dcerpc_atsvc.pc',
        vnum='0.0.1',
-       public_deps='dcerpc ndr-standard',
+       public_deps='dcerpc ndr-standard RPC_NDR_ATSVC',
        public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h',
        header_path='gen_ndr'
        )
@@ -177,38 +133,39 @@ 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
-       rpc/dcerpc_connect.c rpc/dcerpc_secondary.c ../../librpc/rpc/binding.c
-       ../../librpc/rpc/dcerpc_error.c ../../librpc/rpc/dcerpc_util.c
-       ../../librpc/rpc/binding_handle.c''',
+       rpc/dcerpc_connect.c rpc/dcerpc_secondary.c''',
        pc_files='dcerpc.pc',
-       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',
+       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 smbclient-raw LP_RESOLVE tevent-util dcerpc-binding param_options',
        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',
-       header_path='gen_ndr',
+       public_deps='samba-credentials tevent talloc',
+       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''',
+       # It's very important to keep this form of construction
+       # it force the sambawaf extension to put everything that match the first element
+       # (*gen_ndr*) into the dir named by the second element (gen_ndr).
+       # If we just put header_path = 'gen_ndr' then all the public_headers will go
+       # in 'gen_ndr' and for dcerpc.h (at least) it will cause a problem as
+       # we have already a dcerpc.h installed by librpc/wscript_build
+       # and one will overright the other which is not what we expect.
+       header_path=[ ('*gen_ndr*', 'gen_ndr') ],
        vnum='0.0.1'
        )
 
 bld.SAMBA_SUBSYSTEM('pyrpc_util',
        source='rpc/pyrpc_util.c',
-       public_deps='pytalloc-util pyparam_util dcerpc',
+       public_deps='pytalloc-util pyparam_util dcerpc MESSAGING',
        pyext=True,
        )
 
 
 bld.SAMBA_PYTHON('python_dcerpc',
        source='rpc/pyrpc.c',
-       public_deps='LIBCLI_SMB samba-util samba-hostconfig dcerpc-samr RPC_NDR_LSA DYNCONFIG pyrpc_util',
+       public_deps='LIBCLI_SMB samba-util samba-hostconfig dcerpc-samr RPC_NDR_LSA DYNCONFIG pyrpc_util gensec',
        realname='samba/dcerpc/base.so'
        )
 
@@ -224,6 +181,23 @@ bld.SAMBA_PYTHON('python_echo',
        realname='samba/dcerpc/echo.so'
        )
 
+bld.SAMBA_PYTHON('python_dns',
+       source='../../librpc/gen_ndr/py_dns.c',
+       deps='RPC_NDR_DNS pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/dns.so'
+       )
+
+bld.SAMBA_PYTHON('python_auth',
+       source='../../librpc/gen_ndr/py_auth.c',
+       deps='NDR_AUTH pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/auth.so'
+       )
+
+bld.SAMBA_PYTHON('python_krb5pac',
+       source='../../librpc/gen_ndr/py_krb5pac.c',
+       deps='ndr-krb5pac pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/krb5pac.so'
+       )
 
 bld.SAMBA_PYTHON('python_winreg',
        source='../../librpc/gen_ndr/py_winreg.c',
@@ -234,7 +208,7 @@ bld.SAMBA_PYTHON('python_winreg',
 
 bld.SAMBA_PYTHON('python_dcerpc_misc',
        source='../../librpc/gen_ndr/py_misc.c',
-       deps='pytalloc-util pyrpc_util NDR_KRB5PAC',
+       deps='pytalloc-util pyrpc_util ndr-krb5pac',
        realname='samba/dcerpc/misc.so'
        )
 
@@ -269,7 +243,7 @@ bld.SAMBA_PYTHON('python_atsvc',
 
 bld.SAMBA_PYTHON('python_dcerpc_nbt',
        source='../../librpc/gen_ndr/py_nbt.c',
-       deps='NDR_NBT RPC_NDR_NBT pytalloc-util pyrpc_util',
+       deps='ndr_nbt RPC_NDR_NBT pytalloc-util pyrpc_util',
        realname='samba/dcerpc/nbt.so'
        )
 
@@ -353,6 +327,12 @@ bld.SAMBA_PYTHON('python_dcerpc_drsblobs',
        realname='samba/dcerpc/drsblobs.so'
        )
 
+bld.SAMBA_PYTHON('python_dcerpc_dnsp',
+       source='../../librpc/gen_ndr/py_dnsp.c',
+       deps='pytalloc-util pyrpc_util NDR_SECURITY RPC_NDR_DNSP',
+       realname='samba/dcerpc/dnsp.so'
+       )
+
 
 bld.SAMBA_PYTHON('python_dcerpc_xattr',
        source='../../librpc/gen_ndr/py_xattr.c',
@@ -366,9 +346,15 @@ bld.SAMBA_PYTHON('python_netlogon',
        realname='samba/dcerpc/netlogon.so'
        )
 
+bld.SAMBA_PYTHON('python_dnsserver',
+       source='../../librpc/gen_ndr/py_dnsserver.c',
+       deps='RPC_NDR_DNSSERVER pytalloc-util pyrpc_util',
+       realname='samba/dcerpc/dnsserver.so'
+       )
+
 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')
+bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/dcerpc', 'rpc/dcerpc.py', destname='__init__.py')