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

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

diff --git a/source4/configure.ac b/source4/configure.ac
index acc0a8a3edd710d9042ca1d520087a5cf9a20b20..91d7a3be3439db25e57c859922f1f1cd12750d18 100644 (file)
--- a/source4/configure.ac
+++ b/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)

diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk
index 831f8012e3178f089ca3c768b784eee6af0213ae..01bd1f4f284679c042aa1dfedaeefc168332d154 100644 (file)
--- a/source4/lib/policy/config.mk
+++ b/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

diff --git a/source4/lib/policy/gpo_ldap.c b/source4/lib/policy/gp_ldap.c
similarity index 99%
rename from source4/lib/policy/gpo_ldap.c
rename to source4/lib/policy/gp_ldap.c
index 4c44e83cb95efef748caf909c4f1dd0e107cc1df..ee3da9d239945c39e56daf6518802be59600565b 100644 (file)
--- a/source4/lib/policy/gpo_ldap.c
+++ b/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;

diff --git a/source4/lib/policy/gpo.h b/source4/lib/policy/policy.h
similarity index 100%
rename from source4/lib/policy/gpo.h
rename to source4/lib/policy/policy.h

diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build
index eef9683dc7dfdb6e0477f851ef092843c66ab87b..8575f902dd0dd8955cd45334097ceedc863ddcda 100644 (file)
--- a/source4/lib/policy/wscript_build
+++ b/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'
        )

diff --git a/source4/main.mk b/source4/main.mk
index fc085c90bbab52330a86cb3743222197f1e0d63b..d57fad3854c2044a6a6c0f70fa0755237905bc54 100644 (file)
--- a/source4/main.mk
+++ b/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

diff --git a/source4/utils/net/net_gpo.c b/source4/utils/net/net_gpo.c
index 9cedbe27c00bf253961abaa8c429e5173a6a2967..6301fc2129aa0d117d05141fb1816cfd01c36724 100644 (file)
--- a/source4/utils/net/net_gpo.c
+++ b/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)
 {