[PATCH 4/8] gpo: fix the building of gpext to only once

[David Mulder]

From: Garming Sam <garming at catalyst.net.nz>

Signed-off-by: Garming Sam <garming at catalyst.net.nz>
---
 libgpo/wscript_build               | 13 ++++++-------
 source3/libgpo/gpext/wscript_build |  8 --------
 source3/utils/wscript_build        |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/libgpo/wscript_build b/libgpo/wscript_build
index 598cfcb..7d1d326 100644
--- a/libgpo/wscript_build
+++ b/libgpo/wscript_build
@@ -1,13 +1,12 @@
 #!/usr/bin/env python
 
-LIBGPO_SRC = '''gpo_ldap.c gpo_ini.c gpo_util.c gpo_fetch.c gpo_filesync.c
-                gpo_sec.c gpo_reg.c gpext/gpext.c'''
-
-bld.SAMBA3_LIBRARY('gpo',
-                   source='${LIBGPO_SRC}',
+bld.SAMBA3_LIBRARY('gpext',
+                   source='''gpext/gpext.c gpo_util.c gpo_ldap.c gpo_ini.c
+                           gpo_fetch.c gpo_filesync.c
+                           gpo_sec.c gpo_reg.c''',
                    deps='talloc ads TOKEN_UTIL auth',
-                   vars=locals(),
                    private_library=True)
+
 bld.SAMBA3_PYTHON('python_samba_libgpo', 'pygpo.c',
-                 deps='pyparam_util gpo talloc ads TOKEN_UTIL auth',
+                 deps='pyparam_util gpext talloc ads TOKEN_UTIL auth',
                  realname='samba/gpo.so')
diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index 68b39de..365b420 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -1,13 +1,5 @@
 #!/usr/bin/env python
 
-bld.SAMBA3_SUBSYSTEM('gpext',
-                    source='../../../libgpo/gpext/gpext.c',
-                    deps='samba-util samba3core gpo')
-
-GPEXT_REGISTRY_SRC = 'registry.c'
-GPEXT_SCRIPTS_SRC = 'scripts.c'
-GPEXT_SECURITY_SRC = 'security.c'
-
 bld.SAMBA3_MODULE('gpext_registry',
                  subsystem='gpext',
                  source='registry.c',
diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
index 0b9356a..cf6fb10 100644
--- a/source3/utils/wscript_build
+++ b/source3/utils/wscript_build
@@ -222,7 +222,7 @@ bld.SAMBA3_BINARY('net',
                  KRBCLIENT
                  ndr-standard
                  msrpc3
-                 gpo
+                 gpext
                  ads
                  smbd_base
                  LIBADS_SERVER
-- 
2.10.2