From c8b2b109760b366bee6dcf7c6c306936d271f508 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Feb 2011 15:56:20 +1100 Subject: s3-waf: use SAMBA3_*() build rules in source3/build this brings the s3 waf build much closer to the proposed s3build top level build, using the same bld.SAMBA3_*() rules There are a few renames of subsystems in here, with a 3 suffix where it would create a conflict. Pair-Programmed-With: Andrew Bartlett --- source3/libgpo/gpext/wscript_build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/libgpo') diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build index 1f6e8df0fe..bfdb4d0bf6 100644 --- a/source3/libgpo/gpext/wscript_build +++ b/source3/libgpo/gpext/wscript_build @@ -6,11 +6,11 @@ GPEXT_SECURITY_SRC = 'security.c' GPEXT_SRC = '''../../../libgpo/gpext/gpext.c''' -bld.SAMBA_SUBSYSTEM('gpext', +bld.SAMBA3_SUBSYSTEM('gpext', source=GPEXT_SRC, vars=locals()) -bld.SAMBA_MODULE('gpext_registry', +bld.SAMBA3_MODULE('gpext_registry', subsystem='gpext', source=GPEXT_REGISTRY_SRC, deps='NDR_PREG', @@ -18,14 +18,14 @@ bld.SAMBA_MODULE('gpext_registry', internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_registry'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_registry')) -bld.SAMBA_MODULE('gpext_scripts', +bld.SAMBA3_MODULE('gpext_scripts', subsystem='gpext', source=GPEXT_SCRIPTS_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_scripts'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_scripts')) -bld.SAMBA_MODULE('gpext_security', +bld.SAMBA3_MODULE('gpext_security', subsystem='gpext', source=GPEXT_SECURITY_SRC, init_function='', -- cgit