s3-waf: move gpext subsystem to libgpo/gpext/wscript_build.

Guenther

diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
new file mode 100644 (file)
index 0000000..35d3546
--- /dev/null
+++ b/source3/libgpo/gpext/wscript_build
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+
+GPEXT_REGISTRY_SRC = 'registry.c'
+GPEXT_SCRIPTS_SRC = 'scripts.c'
+GPEXT_SECURITY_SRC = 'security.c'
+
+GPEXT_SRC = '''../../../libgpo/gpext/gpext.c'''
+
+bld.SAMBA_SUBSYSTEM('GPEXT',
+                    source=GPEXT_SRC,
+                    deps='''GPEXT_REGISTRY GPEXT_SCRIPTS GPEXT_SECURITY''',
+                    vars=locals())
+
+bld.SAMBA_MODULE('GPEXT_REGISTRY',
+                 subsystem='GPEXT',
+                 source=GPEXT_REGISTRY_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_REGISTRY'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_REGISTRY'))
+
+bld.SAMBA_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',
+                 subsystem='GPEXT',
+                 source=GPEXT_SECURITY_SRC,
+                 init_function='',
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_SECURITY'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_SECURITY'))

diff --git a/source3/wscript_build b/source3/wscript_build
index 6b81247e13781f17306658e20e3f5a989a8bc13e..0434361d33495945c62b2ce7268fc625c9f154bc 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -248,17 +248,9 @@ LIBADDNS_SRC0 = '''libaddns/dnsrecord.c libaddns/dnsutils.c  libaddns/dnssock.c
                libaddns/dnsgss.c libaddns/dnsmarshall.c'''
 LIBADDNS_SRC = '''${LIBADDNS_SRC0} ${SOCKET_WRAPPER_SRC}'''
 
-GPEXT_STATIC = ''
-GPEXT_REGISTRY_SRC = 'libgpo/gpext/registry.c'
-GPEXT_SCRIPTS_SRC = 'libgpo/gpext/scripts.c'
-GPEXT_SECURITY_SRC = 'libgpo/gpext/security.c'
-
-GPEXT_SRC = '''../libgpo/gpext/gpext.c ${GPEXT_STATIC}'''
-
 LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
               ../libgpo/gpo_fetch.c libgpo/gpo_filesync.c ../libgpo/gpo_sec.c
-              libgpo/gpo_reg.c
-              ${GPEXT_SRC}'''
+              libgpo/gpo_reg.c'''
 LIBGPO_SRC = '''${LIBGPO_SRC0}'''
 
 LIBADS_SRC = '''libads/ldap.c
@@ -1118,6 +1110,7 @@ bld.SAMBA_SUBSYSTEM('LIBMSRPC_GEN',
 
 bld.SAMBA_SUBSYSTEM('LIBGPO',
                     source='${LIBGPO_SRC}',
+                    deps='GPEXT',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
@@ -1125,32 +1118,6 @@ bld.SAMBA_SUBSYSTEM('ASN1_UTIL',
                     deps='talloc',
                     local_include=False)
 
-bld.SAMBA_SUBSYSTEM('GPEXT',
-                    source=GPEXT_SRC,
-                    deps='''GPEXT_REGISTRY GPEXT_SCRIPTS GPEXT_SECURITY''',
-                    vars=locals())
-
-bld.SAMBA_MODULE('GPEXT_REGISTRY',
-                 subsystem='GPEXT',
-                 source=GPEXT_REGISTRY_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('GPEXT_SCRIPTS',
-                 subsystem='GPEXT',
-                 source=GPEXT_SCRIPTS_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
-bld.SAMBA_MODULE('GPEXT_SECURITY',
-                 subsystem='GPEXT',
-                 source=GPEXT_SECURITY_SRC,
-                 init_function='',
-                 internal_module=True,
-                 enabled=True)
-
 bld.SAMBA_SUBSYSTEM('AVAHI',
                     source=AVAHI_SRC,
                     deps='avahi-common avahi-client',
@@ -1637,6 +1604,7 @@ bld.RECURSE('modules')
 bld.RECURSE('auth')
 bld.RECURSE('passdb')
 bld.RECURSE('winbindd')
+bld.RECURSE('libgpo/gpext')
 
 bld.ENFORCE_GROUP_ORDERING()
 bld.CHECK_PROJECT_RULES()