summaryrefslogtreecommitdiff
path: root/source4/lib/registry
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-15 22:08:49 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-15 22:08:49 +0200
commit038987543043346cdcd8a4b8fe2970cd1350a7a7 (patch)
tree63df88d6cc354bd766a4b9b3f36d3e43bf67872b /source4/lib/registry
parentf01c377bc039b776ded213f455cdb79d682ae7b2 (diff)
parentb708a3d1e7f8d98bc6cedad8d405b1434d32a22e (diff)
downloadsamba-038987543043346cdcd8a4b8fe2970cd1350a7a7.tar.gz
samba-038987543043346cdcd8a4b8fe2970cd1350a7a7.tar.bz2
samba-038987543043346cdcd8a4b8fe2970cd1350a7a7.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into registry
(This used to be commit 70ebb22c3df178a26c26c0a25c5722ff9ccdb0b4)
Diffstat (limited to 'source4/lib/registry')
-rw-r--r--source4/lib/registry/config.mk51
1 files changed, 24 insertions, 27 deletions
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 77b4ece552..ce19d8512e 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -1,6 +1,7 @@
[SUBSYSTEM::TDR_REGF]
PUBLIC_DEPENDENCIES = TDR
-OBJ_FILES = tdr_regf.o
+
+TDR_REGF_OBJ_FILES = lib/registry/tdr_regf.o
# Special support for external builddirs
lib/registry/regf.c: lib/registry/tdr_regf.c
@@ -17,96 +18,92 @@ clean::
################################################
# Start SUBSYSTEM registry
[LIBRARY::registry]
-VERSION = 0.0.1
-PC_FILE = registry.pc
-SO_VERSION = 0
-OBJ_FILES = \
- interface.o \
- util.o \
- samba.o \
- patchfile_dotreg.o \
- patchfile_preg.o \
- patchfile.o \
- regf.o \
- hive.o \
- local.o \
- ldb.o \
- dir.o \
- rpc.o
PUBLIC_DEPENDENCIES = \
LIBSAMBA-UTIL CHARSET TDR_REGF LIBLDB \
RPC_NDR_WINREG LDB_WRAP
# End MODULE registry_ldb
################################################
+PC_FILES += lib/registry/registry.pc
+
+registry_VERSION = 0.0.1
+registry_SOVERSION = 0
+
+registry_OBJ_FILES = $(addprefix lib/registry/, interface.o util.o samba.o \
+ patchfile_dotreg.o patchfile_preg.o patchfile.o regf.o \
+ hive.o local.o ldb.o dir.o rpc.o)
+
PUBLIC_HEADERS += lib/registry/registry.h
[SUBSYSTEM::registry_common]
PUBLIC_DEPENDENCIES = registry
-OBJ_FILES = tools/common.o
PRIVATE_PROTO_HEADER = tools/common.h
+registry_common_OBJ_FILES = lib/registry/tools/common.o
+
################################################
# Start BINARY regdiff
[BINARY::regdiff]
INSTALLDIR = BINDIR
-OBJ_FILES = tools/regdiff.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
# End BINARY regdiff
################################################
+regdiff_OBJ_FILES = lib/registry/tools/regdiff.o
+
MANPAGES += lib/registry/man/regdiff.1
################################################
# Start BINARY regpatch
[BINARY::regpatch]
INSTALLDIR = BINDIR
-OBJ_FILES = tools/regpatch.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
registry_common
# End BINARY regpatch
################################################
+regpatch_OBJ_FILES = lib/registry/tools/regpatch.o
+
MANPAGES += lib/registry/man/regpatch.1
################################################
# Start BINARY regshell
[BINARY::regshell]
INSTALLDIR = BINDIR
-OBJ_FILES = tools/regshell.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
SMBREADLINE registry_common
# End BINARY regshell
################################################
+regshell_OBJ_FILES = lib/registry/tools/regshell.o
+
MANPAGES += lib/registry/man/regshell.1
################################################
# Start BINARY regtree
[BINARY::regtree]
INSTALLDIR = BINDIR
-OBJ_FILES = tools/regtree.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
registry_common
# End BINARY regtree
################################################
+regtree_OBJ_FILES = lib/registry/tools/regtree.o
+
MANPAGES += lib/registry/man/regtree.1
[SUBSYSTEM::torture_registry]
PRIVATE_DEPENDENCIES = registry
PRIVATE_PROTO_HEADER = tests/proto.h
-OBJ_FILES = \
- tests/generic.o \
- tests/hive.o \
- tests/diff.o \
- tests/registry.o
+
+torture_registry_OBJ_FILES = $(addprefix lib/registry/tests/, generic.o hive.o diff.o registry.o)
[PYTHON::swig_registry]
PUBLIC_DEPENDENCIES = registry
SWIG_FILE = registry.i
+swig_registry_OBJ_FILES = lib/registry/registry_wrap.o