summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-09-23 05:54:12 -0700
committerGünther Deschner <gd@samba.org>2010-09-23 08:13:14 -0700
commit43e3555ed94131da9ef7fc9a8bd3d81ce9ec6db4 (patch)
treed8300309b05aacee48bad3c261570f4b603c337b
parent247521064ff0fcb6763c1e337f277227b4cef421 (diff)
downloadsamba-43e3555ed94131da9ef7fc9a8bd3d81ce9ec6db4.tar.gz
samba-43e3555ed94131da9ef7fc9a8bd3d81ce9ec6db4.tar.bz2
samba-43e3555ed94131da9ef7fc9a8bd3d81ce9ec6db4.zip
s4-waf: move two more NDR_ subsystems to main directory.
Guenther
-rw-r--r--librpc/wscript_build10
-rwxr-xr-xsource4/librpc/wscript_build13
2 files changed, 10 insertions, 13 deletions
diff --git a/librpc/wscript_build b/librpc/wscript_build
index 246a054431..4de5cc1f87 100644
--- 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 52df05f53a..72cf1d887a 100755
--- 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'