s4-waf: move two more NDR_ subsystems to main directory.

Guenther

diff --git a/librpc/wscript_build b/librpc/wscript_build
index 246a054431e491b42e5fa49c958540c8d275141b..4de5cc1f87744503532500b6c22a1f7b24a6ac74 100644 (file)
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -117,6 +117,16 @@ bld.SAMBA_SUBSYSTEM('NDR_REMACT',
        public_deps='LIBNDR NDR_ORPC'
        )
 
+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_WZCSVC',
        source='../librpc/gen_ndr/ndr_wzcsvc.c',
        public_deps='LIBNDR'

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 52df05f53ab8cbb66996e165bddc2da66233a707..72cf1d887a4c0e5dcf4245bfa74cb4d10b4f74db 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -42,19 +42,6 @@ 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_SASL_HELPERS',
        source='gen_ndr/ndr_sasl_helpers.c',
        public_deps='LIBNDR'