diff options
| author | Wilco Baan Hofman <wilco@baanhofman.nl> | 2010-04-23 11:53:04 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-20 17:19:10 +0200 |
| commit | b02571541998f2698a92be8729f4f0da869a0f99 (patch) | |
| tree | fd1afd2b5b78cc99a716eaf0921b14e366151eca | |
| parent | 626db5c3b5854a895b79ab186a36d1b5cbb769b5 (diff) | |
| download | samba-b02571541998f2698a92be8729f4f0da869a0f99.tar.gz samba-b02571541998f2698a92be8729f4f0da869a0f99.tar.bz2 samba-b02571541998f2698a92be8729f4f0da869a0f99.zip | |
Rename libgpo to lib/policy to avoid confusion with samba3 and add waf build
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
| -rw-r--r-- | source4/Makefile.in | 2 | ||||
| -rw-r--r-- | source4/lib/policy/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/policy/gpo.h (renamed from source4/libgpo/gpo.h) | 0 | ||||
| -rw-r--r-- | source4/lib/policy/gpo_ldap.c (renamed from source4/libgpo/gpo_ldap.c) | 0 | ||||
| -rw-r--r-- | source4/lib/policy/policy.pc.in | 12 | ||||
| -rw-r--r-- | source4/lib/policy/wscript_build | 9 | ||||
| -rw-r--r-- | source4/libgpo/config.mk | 4 | ||||
| -rw-r--r-- | source4/utils/net/config.mk | 2 | ||||
| -rw-r--r-- | source4/utils/net/wscript_build | 4 | ||||
| -rw-r--r-- | source4/wscript_build | 2 |
10 files changed, 30 insertions, 9 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in index b40d367602..40f35e0308 100644 --- a/source4/Makefile.in +++ b/source4/Makefile.in @@ -109,7 +109,7 @@ ntp_signdsrcdir := ntp_signd wmisrcdir := lib/wmi tallocsrcdir := ../lib/talloc comsrcdir := $(srcdir)/lib/com -libgpodir := libgpo +policydir := lib/policy include data.mk diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk new file mode 100644 index 0000000000..831f8012e3 --- /dev/null +++ b/source4/lib/policy/config.mk @@ -0,0 +1,4 @@ +[SUBSYSTEM::policy] +PRIVATE_DEPENDENCIES = LIBLDB LIBSAMBA-NET + +policy_OBJ_FILES = $(policydir)/gpo_ldap.o diff --git a/source4/libgpo/gpo.h b/source4/lib/policy/gpo.h index 2e58094608..2e58094608 100644 --- a/source4/libgpo/gpo.h +++ b/source4/lib/policy/gpo.h diff --git a/source4/libgpo/gpo_ldap.c b/source4/lib/policy/gpo_ldap.c index 4c44e83cb9..4c44e83cb9 100644 --- a/source4/libgpo/gpo_ldap.c +++ b/source4/lib/policy/gpo_ldap.c diff --git a/source4/lib/policy/policy.pc.in b/source4/lib/policy/policy.pc.in new file mode 100644 index 0000000000..0ad849ab03 --- /dev/null +++ b/source4/lib/policy/policy.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: policy +Description: Active Directory Group Policy library +Requires: talloc +Requires.private: ldb +Version: 0.0.1 +Libs: -L${libdir} -lpolicy +Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1 diff --git a/source4/lib/policy/wscript_build b/source4/lib/policy/wscript_build new file mode 100644 index 0000000000..eef9683dc7 --- /dev/null +++ b/source4/lib/policy/wscript_build @@ -0,0 +1,9 @@ +#!/usr/bin/env python + +bld.SAMBA_LIBRARY('policy', + source='gpo_ldap.c', + pc_files='policy.pc', + public_deps='LIBLDB LIBSAMBA-NET', + public_headers='gpo.h', + vnum='0.0.1' + ) diff --git a/source4/libgpo/config.mk b/source4/libgpo/config.mk deleted file mode 100644 index 77eb3073ac..0000000000 --- a/source4/libgpo/config.mk +++ /dev/null @@ -1,4 +0,0 @@ -[SUBSYSTEM::LIBGPO] -PRIVATE_DEPENDENCIES = LIBLDB LIBSAMBA-NET - -LIBGPO_OBJ_FILES = $(libgpodir)/gpo_ldap.o diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk index 5549d5d7e4..032f68555a 100644 --- a/source4/utils/net/config.mk +++ b/source4/utils/net/config.mk @@ -33,7 +33,7 @@ PRIVATE_DEPENDENCIES = \ LIBPOPT \ POPT_SAMBA \ POPT_CREDENTIALS \ - LIBGPO \ + policy \ net_drs # End BINARY net ################################# diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build index d86b800268..07aa8f7d06 100644 --- a/source4/utils/net/wscript_build +++ b/source4/utils/net/wscript_build @@ -10,9 +10,9 @@ bld.SAMBA_MODULE('net_drs', bld.SAMBA_BINARY('net', - source='net.c net_password.c net_join.c net_vampire.c', + source='net.c net_password.c net_join.c net_vampire.c net_gpo.c', autoproto='net_proto.h', - deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-NET popt POPT_SAMBA POPT_CREDENTIALS net_drs', + deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-NET popt POPT_SAMBA POPT_CREDENTIALS net_drs policy', needs_python=True ) diff --git a/source4/wscript_build b/source4/wscript_build index 00c3e73dc9..6c1eac6905 100644 --- a/source4/wscript_build +++ b/source4/wscript_build @@ -107,7 +107,7 @@ bld.RECURSE('../libcli/nbt') bld.RECURSE('../libcli/auth') bld.RECURSE('../libcli/drsuapi') bld.RECURSE('../libcli/samsync') -bld.RECURSE('../libgpo') +bld.RECURSE('lib/policy') bld.RECURSE('../libcli/named_pipe_auth') bld.RECURSE('heimdal_build') bld.RECURSE('lib/smbreadline') |