waf: RPC_NDR_WINBIND is samba4 specific
[kai/samba.git] / source4 / librpc / wscript_build
index 65e8260ab43ba4b2ada491d75c998933c1143955..920d6a2c310cab0d0b17adcd7ac87507311f9c7b 100755 (executable)
@@ -6,10 +6,10 @@ bld.RECURSE('idl')
 bld.SAMBA_LIBRARY('LIBNDR',
        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='LIBSAMBA-ERRORS talloc LIBSAMBA-UTIL CHARSET LIBSAMBA-HOSTCONFIG',
+       public_deps='LIBSAMBA-ERRORS talloc LIBSAMBA-UTIL CHARSET',
        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',
+       header_path= [ ( '*gen_ndr*', 'gen_ndr' ) ],
+       depends_on='PIDL_MISC',
        vnum='0.0.1'
        )
 
@@ -21,36 +21,12 @@ bld.SAMBA_BINARY('ndrdump',
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
-       source='../../librpc/ndr/ndr_compression.c',
-       public_deps='LIBSAMBA-ERRORS LIBNDR',
-       deps='ZLIB LZXPRESS'
-       )
-
 
 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_deps='LIBNDR',
        public_headers='../../librpc/gen_ndr/security.h gen_ndr/server_id.h',
-        header_path='gen_ndr'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV',
-       source='../../librpc/gen_ndr/ndr_audiosrv.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH',
-       source='../../librpc/gen_ndr/ndr_named_pipe_auth.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DNSSERVER',
-       source='../../librpc/gen_ndr/ndr_dnsserver.c',
-       public_deps='LIBNDR'
+       header_path='gen_ndr'
        )
 
 
@@ -66,89 +42,12 @@ bld.SAMBA_SUBSYSTEM('NDR_IRPC',
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_DCOM',
-       source='../../librpc/gen_ndr/ndr_dcom.c',
-       public_deps='LIBNDR NDR_SECURITY NDR_ORPC'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_WMI',
-       source='../../librpc/ndr/ndr_wmi.c ../../librpc/gen_ndr/ndr_wmi.c',
-       public_deps='LIBNDR NDR_SECURITY NDR_DCOM'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP',
-       source='../../librpc/gen_ndr/ndr_dsbackup.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_EFS',
-       source='../../librpc/gen_ndr/ndr_efs.c',
-       public_deps='LIBNDR NDR_SECURITY'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_ROT',
-       source='../../librpc/gen_ndr/ndr_rot.c',
-       public_deps='LIBNDR NDR_ORPC'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_FRSRPC',
-       source='../../librpc/ndr/ndr_frsrpc.c ../../librpc/gen_ndr/ndr_frsrpc.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_FRSAPI',
-       source='../../librpc/gen_ndr/ndr_frsapi.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_FRSTRANS',
-       source='../../librpc/gen_ndr/ndr_frstrans.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DRSUAPI',
-       source='../../librpc/ndr/ndr_drsuapi.c ../../librpc/gen_ndr/ndr_drsuapi.c',
-       public_deps='LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_STANDARD ASN1_UTIL'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DRSBLOBS',
-       source='../../librpc/ndr/ndr_drsblobs.c ../../librpc/gen_ndr/ndr_drsblobs.c',
-       public_deps='LIBNDR NDR_DRSUAPI'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DFSBLOBS',
-       source='../../librpc/gen_ndr/ndr_dfsblobs.c',
-       public_deps='LIBNDR'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('NDR_SASL_HELPERS',
        source='gen_ndr/ndr_sasl_helpers.c',
        public_deps='LIBNDR'
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_POLICYAGENT',
-       source='../../librpc/gen_ndr/ndr_policyagent.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_UNIXINFO',
-       source='../../librpc/gen_ndr/ndr_unixinfo.c',
-       public_deps='LIBNDR NDR_SECURITY'
-       )
-
 
 bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL',
        source='gen_ndr/ndr_nfs4acl.c',
@@ -156,41 +55,6 @@ bld.SAMBA_SUBSYSTEM('NDR_NFS4ACL',
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS',
-       source='../../librpc/gen_ndr/ndr_spoolss.c',
-       public_deps='LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_SPOOLSS_BUF',
-       source='../../librpc/ndr/ndr_spoolss_buf.c',
-        deps='talloc'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_EPMAPPER',
-       source='../../librpc/gen_ndr/ndr_epmapper.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DBGIDL',
-       source='../../librpc/gen_ndr/ndr_dbgidl.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_DSSETUP',
-       source='../../librpc/gen_ndr/ndr_dssetup.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_MSGSVC',
-       source='../../librpc/gen_ndr/ndr_msgsvc.c',
-       public_deps='LIBNDR'
-       )
-
 
 bld.SAMBA_SUBSYSTEM('NDR_WINSIF',
        source='gen_ndr/ndr_winsif.c',
@@ -198,89 +62,6 @@ bld.SAMBA_SUBSYSTEM('NDR_WINSIF',
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_MGMT',
-       source='../../librpc/gen_ndr/ndr_mgmt.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_PROTECTED_STORAGE',
-       source='../../librpc/gen_ndr/ndr_protected_storage.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_ORPC',
-       source='../../librpc/ndr/ndr_orpc.c ../../librpc/gen_ndr/ndr_orpc.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_OXIDRESOLVER',
-       source='../../librpc/gen_ndr/ndr_oxidresolver.c',
-       public_deps='LIBNDR NDR_ORPC'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_REMACT',
-       source='../../librpc/gen_ndr/ndr_remact.c',
-       public_deps='LIBNDR NDR_ORPC'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_WZCSVC',
-       source='../../librpc/gen_ndr/ndr_wzcsvc.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_BROWSER',
-       source='../../librpc/gen_ndr/ndr_browser.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_W32TIME',
-       source='../../librpc/gen_ndr/ndr_w32time.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_SCERPC',
-       source='../../librpc/gen_ndr/ndr_scerpc.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_TRKWKS',
-       source='../../librpc/gen_ndr/ndr_trkwks.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_KEYSVC',
-       source='../../librpc/gen_ndr/ndr_keysvc.c',
-       public_deps='LIBNDR'
-       )
-
-bld.SAMBA_SUBSYSTEM('NDR_RAP',
-       source='../../librpc/gen_ndr/ndr_rap.c ../../librpc/ndr/ndr_rap.c',
-       public_deps='LIBNDR'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_KRB5PAC',
-       source='../../librpc/ndr/ndr_krb5pac.c ../../librpc/gen_ndr/ndr_krb5pac.c',
-       public_deps='LIBNDR NDR_STANDARD NDR_SECURITY'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('NDR_XATTR',
-       source='../../librpc/ndr/ndr_xattr.c ../../librpc/gen_ndr/ndr_xattr.c',
-       public_deps='LIBNDR NDR_SECURITY'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('NDR_OPENDB',
        source='gen_ndr/ndr_opendb.c',
        public_deps='LIBNDR'
@@ -293,20 +74,6 @@ bld.SAMBA_SUBSYSTEM('NDR_NOTIFY',
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
-       source='../../librpc/ndr/ndr_schannel.c ../../librpc/gen_ndr/ndr_schannel.c',
-       public_deps='LIBNDR NDR_NBT'
-       )
-
-
-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',
-        header_path='gen_ndr'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND',
        source='gen_ndr/ndr_ntp_signd.c',
        public_deps='LIBNDR'
@@ -319,136 +86,49 @@ bld.SAMBA_SUBSYSTEM('NDR_WINSREPL',
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_IDMAP',
-       source='../../librpc/gen_ndr/ndr_idmap.c',
-       public_deps='LIBNDR NDR_STANDARD'
-       )
-
 bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
        source='gen_ndr/ndr_winbind.c',
        public_deps='NDR_IDMAP LIBNDR NDR_STANDARD'
        )
 
 
-bld.SAMBA_SUBSYSTEM('NDR_NTLMSSP',
-       source='../../librpc/ndr/ndr_ntlmssp.c ../../librpc/gen_ndr/ndr_ntlmssp.c',
-       public_deps='LIBNDR NDR_STANDARD'
-       )
-
-bld.SAMBA_SUBSYSTEM('NDR_DNSP',
-       source='../../librpc/gen_ndr/ndr_dnsp.c ../../librpc/ndr/ndr_dnsp.c',
-       public_deps='LIBNDR'
-       )
-
-bld.SAMBA_SUBSYSTEM('NDR_NTPRINTING',
-       source='../../librpc/gen_ndr/ndr_ntprinting.c ../../librpc/ndr/ndr_ntprinting.c',
-       public_deps='LIBNDR'
-       )
-
 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 ../../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_atsvc.c ../../librpc/gen_ndr/ndr_eventlog6.c',
        vnum='0.0.1',
        pc_files='../../librpc/ndr_standard.pc',
-       deps='NDR_SECURITY',
+       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 LIBSECURITY',
        public_deps='LIBNDR',
        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',
+                  private_library=True,
+                  grouping_library=True
+                  )
+
+# a grouping library for RPC_NDR subsystems that may be used by more than one target
+bld.SAMBA_LIBRARY('RPC_NDR_SAMBA4',
+                  source=[],
+                  deps='RPC_NDR_WINBIND',
+                  private_library=True,
+                  grouping_library=True
+                  )
+
 
 bld.SAMBA_PIDL_TABLES('GEN_NDR_TABLES', 'gen_ndr/tables.c')
 
-bld.SAMBA_SUBSYSTEM('NDR_TABLE',
+bld.SAMBA_LIBRARY('NDR_TABLE',
        source='../../librpc/ndr/ndr_table.c gen_ndr/tables.c',
        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_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',
+        private_library=True,
         depends_on='GEN_NDR_TABLES'
        )
 
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_XATTR',
-       source='../../librpc/gen_ndr/ndr_xattr_c.c',
-       public_deps='NDR_XATTR dcerpc'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_ROT',
-       source='../../librpc/gen_ndr/ndr_rot_c.c',
-       public_deps='NDR_ROT dcerpc'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_AUDIOSRV',
-       source='../../librpc/gen_ndr/ndr_audiosrv_c.c',
-       public_deps='NDR_AUDIOSRV dcerpc'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_ECHO',
-       source='../../librpc/gen_ndr/ndr_echo_c.c',
-       public_deps='dcerpc NDR_STANDARD'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_DSBACKUP',
-       source='../../librpc/gen_ndr/ndr_dsbackup_c.c',
-       public_deps='dcerpc NDR_DSBACKUP'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_EFS',
-       source='../../librpc/gen_ndr/ndr_efs_c.c',
-       public_deps='dcerpc NDR_EFS'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
-       source='../../librpc/gen_ndr/ndr_lsa_c.c',
-       public_deps='dcerpc NDR_STANDARD'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_DFS',
-       source='../../librpc/gen_ndr/ndr_dfs_c.c',
-       public_deps='dcerpc NDR_STANDARD'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_FRSAPI',
-       source='../../librpc/gen_ndr/ndr_frsapi_c.c',
-       public_deps='dcerpc NDR_FRSAPI'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_DRSUAPI',
-       source='../../librpc/gen_ndr/ndr_drsuapi_c.c',
-       public_deps='dcerpc 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'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_UNIXINFO',
-       source='../../librpc/gen_ndr/ndr_unixinfo_c.c',
-       public_deps='dcerpc NDR_UNIXINFO'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_BROWSER',
-       source='../../librpc/gen_ndr/ndr_browser_c.c',
-       public_deps='dcerpc NDR_BROWSER'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_IRPC',
        source='gen_ndr/ndr_irpc_c.c',
        public_deps='dcerpc NDR_IRPC'
@@ -470,36 +150,6 @@ bld.SAMBA_LIBRARY('dcerpc_samr',
        )
 
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_SPOOLSS',
-       source='../../librpc/gen_ndr/ndr_spoolss_c.c',
-       public_deps='dcerpc NDR_SPOOLSS'
-       )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_NBT',
-       source='../../librpc/gen_ndr/ndr_nbt_c.c',
-       public_deps='dcerpc NDR_NBT'
-       )
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_WKSSVC',
-       source='../../librpc/gen_ndr/ndr_wkssvc_c.c',
-       public_deps='dcerpc NDR_STANDARD'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
-       source='../../librpc/gen_ndr/ndr_srvsvc_c.c',
-       public_deps='dcerpc 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',
-        header_path='gen_ndr'
-       )
-
-
 bld.SAMBA_LIBRARY('dcerpc_atsvc',
        source='../../librpc/gen_ndr/ndr_atsvc_c.c',
        pc_files='dcerpc_atsvc.pc',
@@ -510,120 +160,12 @@ bld.SAMBA_LIBRARY('dcerpc_atsvc',
        )
 
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_EVENTLOG',
-       source='../../librpc/gen_ndr/ndr_eventlog_c.c',
-       public_deps='dcerpc NDR_STANDARD'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_EPMAPPER',
-       source='../../librpc/gen_ndr/ndr_epmapper_c.c',
-       public_deps='tevent NDR_EPMAPPER'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_DBGIDL',
-       source='../../librpc/gen_ndr/ndr_dbgidl_c.c',
-       public_deps='dcerpc NDR_DBGIDL'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_DSSETUP',
-       source='../../librpc/gen_ndr/ndr_dssetup_c.c',
-       public_deps='dcerpc NDR_DSSETUP'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_MSGSVC',
-       source='../../librpc/gen_ndr/ndr_msgsvc_c.c',
-       public_deps='dcerpc NDR_MSGSVC'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WINSIF',
        source='gen_ndr/ndr_winsif_c.c',
        public_deps='dcerpc NDR_WINSIF'
        )
 
 
-bld.SAMBA_SUBSYSTEM('RPC_NDR_WINREG',
-       source='../../librpc/gen_ndr/ndr_winreg_c.c',
-       public_deps='dcerpc NDR_STANDARD'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_INITSHUTDOWN',
-       source='../../librpc/gen_ndr/ndr_initshutdown_c.c',
-       public_deps='dcerpc NDR_STANDARD'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_MGMT',
-       source='../../librpc/gen_ndr/ndr_mgmt_c.c',
-       deps='tevent NDR_MGMT'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_PROTECTED_STORAGE',
-       source='../../librpc/gen_ndr/ndr_protected_storage_c.c',
-       public_deps='dcerpc NDR_PROTECTED_STORAGE'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_OXIDRESOLVER',
-       source='../../librpc/gen_ndr/ndr_oxidresolver_c.c',
-       public_deps='dcerpc NDR_OXIDRESOLVER'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_REMACT',
-       source='../../librpc/gen_ndr/ndr_remact_c.c',
-       public_deps='dcerpc NDR_REMACT'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_WZCSVC',
-       source='../../librpc/gen_ndr/ndr_wzcsvc_c.c',
-       public_deps='dcerpc NDR_WZCSVC'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_W32TIME',
-       source='../../librpc/gen_ndr/ndr_w32time_c.c',
-       public_deps='dcerpc NDR_W32TIME'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_SCERPC',
-       source='../../librpc/gen_ndr/ndr_scerpc_c.c',
-       public_deps='dcerpc NDR_SCERPC'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_NTSVCS',
-       source='../../librpc/gen_ndr/ndr_ntsvcs_c.c',
-       public_deps='dcerpc NDR_STANDARD'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_NETLOGON',
-       source='../../librpc/gen_ndr/ndr_netlogon_c.c',
-       public_deps='NDR_STANDARD'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_TRKWKS',
-       source='../../librpc/gen_ndr/ndr_trkwks_c.c',
-       public_deps='dcerpc NDR_TRKWKS'
-       )
-
-
-bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
-       source='../../librpc/gen_ndr/ndr_keysvc_c.c',
-       public_deps='dcerpc NDR_KEYSVC'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
        source='../../librpc/gen_ndr/ndr_dcerpc.c',
        public_deps='LIBNDR',
@@ -647,10 +189,10 @@ bld.SAMBA_LIBRARY('dcerpc',
        )
 
 bld.SAMBA_SUBSYSTEM('pyrpc_util',
-       source='rpc/pyrpc_util.c',
-       public_deps='PYTALLOC pyparam_util pycredentials dcerpc',
-        needs_python=True,
-       )
+                    source='rpc/pyrpc_util.c',
+                    public_deps='PYTALLOC pyparam_util dcerpc',
+                    pyext=True,
+                    )
 
 
 bld.SAMBA_PYTHON('python_dcerpc',
@@ -676,7 +218,7 @@ bld.SAMBA_PYTHON('python_winreg',
 
 bld.SAMBA_PYTHON('python_dcerpc_misc',
        source='../../librpc/gen_ndr/py_misc.c',
-       deps='PYTALLOC pyrpc_util NDR_MISC NDR_KRB5PAC',
+       deps='PYTALLOC pyrpc_util NDR_KRB5PAC',
        realname='samba/dcerpc/misc.so'
        )