Rename files to reflect the libpolicy naming convention. Also fix the GNU make build.

Signed-off-by: Jelmer Vernooij <jelmer@samba.org>

source4/configure.ac

@@ -34,6 +34,7 @@ m4_include(../nsswitch/nsstest.m4)
 m4_include(../pidl/config.m4)
 
 AC_CONFIG_FILES(lib/registry/registry.pc)
+AC_CONFIG_FILES(lib/policy/policy.pc)
 AC_CONFIG_FILES(librpc/dcerpc.pc)
 AC_CONFIG_FILES(../librpc/ndr.pc)
 AC_CONFIG_FILES(../librpc/ndr_standard.pc)

source4/lib/policy/config.mk

@@ -1,4 +1,6 @@
 [SUBSYSTEM::policy]
 PRIVATE_DEPENDENCIES = LIBLDB LIBSAMBA-NET
 
-policy_OBJ_FILES = $(policydir)/gpo_ldap.o
+policy_OBJ_FILES = $(policydir)/gp_ldap.o
+
+PC_FILES += $(policydir)/policy.pc

source4/lib/policy/gp_ldap.c

@@ -29,7 +29,7 @@
 #include "../libcli/security/dom_sid.h"
 #include "libcli/security/security.h"
 #include "../lib/talloc/talloc.h"
-#include "gpo.h"
+#include "policy.h"
 
 struct gpo_stringmap {
 	const char *str;

source4/lib/policy/wscript_build

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
 bld.SAMBA_LIBRARY('policy',
-	source='gpo_ldap.c',
+	source='gp_ldap.c',
 	pc_files='policy.pc',
 	public_deps='LIBLDB LIBSAMBA-NET',
-	public_headers='gpo.h',
+	public_headers='policy.h',
 	vnum='0.0.1'
 	)

source4/main.mk

@@ -60,5 +60,5 @@ mkinclude ../libcli/nbt/config.mk
 mkinclude ../libcli/auth/config.mk
 mkinclude ../libcli/drsuapi/config.mk
 mkinclude ../libcli/samsync/config.mk
-mkinclude libgpo/config.mk
+mkinclude lib/policy/config.mk
 mkinclude ../libcli/named_pipe_auth/config.mk

source4/utils/net/net_gpo.c

@@ -26,7 +26,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
 #include "param/param.h"
-#include "libgpo/gpo.h"
+#include "lib/policy/policy.h"
 
 static int net_gpo_list_all_usage(struct net_context *ctx, int argc, const char **argv)
 {