From: Günther Deschner <gd@samba.org>
Date: Fri, 8 Jun 2018 14:13:22 +0000 (+0200)
Subject: utils:libgpo: re-add libgpo as library, it should not be part of gpext
X-Git-Tag: ldb-1.6.1~305
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d42029ff79358684c1bfc51bde3cbd31ed840bd;p=thirdparty%2Fsamba.git

utils:libgpo: re-add libgpo as library, it should not be part of gpext

It was initially removed in 78fd02cf31dfe72d596030f342aebefba1e72263 but
is needed by the inf file parsing.

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Bjoern Jacke <bjacke@samba.org>
---

diff --git a/libgpo/wscript_build b/libgpo/wscript_build
index 9fbff9d0974..6c412275958 100644
--- a/libgpo/wscript_build
+++ b/libgpo/wscript_build
@@ -1,10 +1,17 @@
 #!/usr/bin/env python
 
-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''',
+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}',
                    deps='talloc ads TOKEN_UTIL auth',
+                   vars=locals(),
+                   private_library=True)
+
+bld.SAMBA3_LIBRARY('gpext',
+                   source='''gpext/gpext.c''',
+                   deps='talloc ads TOKEN_UTIL auth gpo',
                    private_library=True)
 
 for env in bld.gen_python_environments():
diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
index c6d1c29b310..b254073358c 100644
--- a/source3/utils/wscript_build
+++ b/source3/utils/wscript_build
@@ -238,7 +238,7 @@ bld.SAMBA3_BINARY('net',
                  KRBCLIENT
                  ndr-standard
                  msrpc3
-                 gpext
+                 gpo
                  ads
                  smbd_base
                  LIBADS_SERVER