waf: add more NDR subsystems for shared IDL files.

Guenther

diff --git a/librpc/wscript_build b/librpc/wscript_build
index ddee66a21a197f5f4d6d874f80ab0485e0c1114d..477f6dd0b99dadac714e7fe2d9c444c1bbbeee28 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -22,6 +22,16 @@ bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP',
        public_deps='LIBNDR'
        )
 
+bld.SAMBA_SUBSYSTEM('NDR_DFS',
+       source='../librpc/gen_ndr/ndr_dfs.c',
+       public_deps='LIBNDR'
+       )
+
+bld.SAMBA_SUBSYSTEM('NDR_WINREG',
+       source='../librpc/gen_ndr/ndr_winreg.c',
+       public_deps='LIBNDR NDR_SECURITY NDR_LSA'
+       )
+
 bld.SAMBA_SUBSYSTEM('NDR_EFS',
        source='../librpc/gen_ndr/ndr_efs.c',
        public_deps='LIBNDR NDR_SECURITY'
@@ -202,11 +212,36 @@ bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
        public_deps='LIBNDR NDR_SECURITY NDR_SVCCTL'
        )
 
+bld.SAMBA_SUBSYSTEM('NDR_NETLOGON',
+       source='../librpc/gen_ndr/ndr_netlogon.c ../librpc/ndr/ndr_netlogon.c',
+       public_deps='LIBNDR NDR_SECURITY NDR_LSA NDR_SAMR NDR_NBT'
+       )
+
 bld.SAMBA_SUBSYSTEM('NDR_EVENTLOG',
        source='../librpc/gen_ndr/ndr_eventlog.c',
        public_deps='LIBNDR NDR_SECURITY NDR_LSA'
        )
 
+bld.SAMBA_SUBSYSTEM('NDR_NTSVCS',
+       source='../librpc/gen_ndr/ndr_ntsvcs.c',
+       public_deps='LIBNDR'
+       )
+
+bld.SAMBA_SUBSYSTEM('NDR_WKSSVC',
+       source='../librpc/gen_ndr/ndr_wkssvc.c',
+       public_deps='LIBNDR NDR_SECURITY'
+       )
+
+bld.SAMBA_SUBSYSTEM('NDR_ECHO',
+       source='../librpc/gen_ndr/ndr_echo.c',
+       public_deps='LIBNDR'
+       )
+
+bld.SAMBA_SUBSYSTEM('NDR_INITSHUTDOWN',
+       source='../librpc/gen_ndr/ndr_initshutdown.c',
+       public_deps='LIBNDR NDR_LSA'
+       )
+
 bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
        source='../librpc/ndr/ndr_compression.c',
        public_deps='LIBSAMBA-ERRORS LIBNDR',
@@ -281,6 +316,11 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_LSA',
        public_deps='dcerpc NDR_STANDARD'
        )
 
+bld.SAMBA_SUBSYSTEM('RPC_NDR_SAMR',
+       source='../librpc/gen_ndr/ndr_samr_c.c',
+       public_deps='dcerpc NDR_SAMR'
+       )
+
 bld.SAMBA_SUBSYSTEM('RPC_NDR_DFS',
        source='../librpc/gen_ndr/ndr_dfs_c.c',
        public_deps='dcerpc NDR_STANDARD'

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index edbf662a18351a8cf435e7926beaf2ce5854043a..fc683264258f039ca5bf85edb0769b7c2fbb8d6a 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -93,10 +93,10 @@ bld.SAMBA_SUBSYSTEM('NDR_WINBIND',
 
 
 bld.SAMBA_LIBRARY('NDR_STANDARD',
-       source='../../librpc/gen_ndr/ndr_echo.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_ntsvcs.c ../../librpc/gen_ndr/ndr_eventlog6.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 NDR_LSA NDR_SAMR NDR_EVENTLOG',
+       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',
        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'