r26600: Provide dir variable with current basedir in Makefile.

[ira/wip.git] / source / lib / registry / config.mk

diff --git a/source/lib/registry/config.mk b/source/lib/registry/config.mk
index 13700939cbc6fd94edeab544679a341ed58cf23b..71c973f68d449637714f35478283e9d966e61e29 100644 (file)
--- a/source/lib/registry/config.mk
+++ b/source/lib/registry/config.mk
@@ -1,84 +1,18 @@
-# Registry backends
-
-################################################
-# Start MODULE registry_nt4
-[MODULE::registry_nt4]
-INIT_FUNCTION = registry_nt4_init
-SUBSYSTEM = registry
-OBJ_FILES = \
-               reg_backend_nt4.o
-REQUIRED_SUBSYSTEMS = TDR_REGF
-# End MODULE registry_nt4
-################################################
-
 [SUBSYSTEM::TDR_REGF]
-REQUIRED_SUBSYSTEMS = TDR 
+PUBLIC_DEPENDENCIES = TDR 
 OBJ_FILES = tdr_regf.o
 
-lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
-lib/registry/tdr_regf.c: lib/registry/regf.idl
-       @CPP="$(CPP)" $(PERL) pidl/pidl $(PIDL_ARGS) \
-               --header --outputdir=lib/registry \
-               --tdr-parser -- lib/registry/regf.idl
-
-################################################
-# Start MODULE registry_w95
-[MODULE::registry_w95]
-INIT_FUNCTION = registry_w95_init
-SUBSYSTEM = registry
-OBJ_FILES = \
-               reg_backend_w95.o
-# End MODULE registry_w95
-################################################
-
-################################################
-# Start MODULE registry_dir
-[MODULE::registry_dir]
-INIT_FUNCTION = registry_dir_init
-SUBSYSTEM = registry
-OBJ_FILES = \
-               reg_backend_dir.o
-REQUIRED_SUBSYSTEMS = LIBTALLOC
-# End MODULE registry_dir
-################################################
-
-################################################
-# Start MODULE registry_rpc
-[MODULE::registry_rpc]
-INIT_FUNCTION = registry_rpc_init
-PRIVATE_PROTO_HEADER = reg_backend_rpc.h
-OUTPUT_TYPE = MERGEDOBJ
-SUBSYSTEM = registry
-OBJ_FILES = \
-               reg_backend_rpc.o
-REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG
-# End MODULE registry_rpc
-################################################
-
-
-
-################################################
-# Start MODULE registry_gconf
-[MODULE::registry_gconf]
-INIT_FUNCTION = registry_gconf_init
-SUBSYSTEM = registry
-OBJ_FILES = \
-               reg_backend_gconf.o
-REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
-# End MODULE registry_gconf
-################################################
+# Special support for external builddirs
+$(dir)/regf.c: $(dir)/tdr_regf.c
+$(srcdir)/$(dir)/regf.c: $(dir)/tdr_regf.c
+$(dir)/tdr_regf.h: $(dir)/tdr_regf.c
+$(dir)/tdr_regf.c: $(srcdir)/$(dir)/regf.idl
+       @CPP="$(CPP)" srcdir="$(srcdir)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \
+               --header --outputdir=$(dir) \
+               --tdr-parser -- $(srcdir)/$(dir)/regf.idl
 
-################################################
-# Start MODULE registry_ldb
-[MODULE::registry_ldb]
-INIT_FUNCTION = registry_ldb_init
-SUBSYSTEM = registry
-OBJ_FILES = \
-               reg_backend_ldb.o
-REQUIRED_SUBSYSTEMS = \
-               ldb
-# End MODULE registry_ldb
-################################################
+clean::
+       @-rm -f $(dir)/regf.h $(dir)/tdr_regf*
 
 ################################################
 # Start SUBSYSTEM registry
@@ -87,25 +21,37 @@ VERSION = 0.0.1
 SO_VERSION = 0
 DESCRIPTION = Windows-style registry library
 OBJ_FILES = \
-               common/reg_interface.o \
-               common/reg_util.o \
-               reg_samba.o \
-               patchfile.o
-REQUIRED_SUBSYSTEMS = \
-               LIBBASIC
-PRIVATE_PROTO_HEADER = registry_proto.h
-PUBLIC_HEADERS = registry.h
+               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
+PUBLIC_HEADERS = registry.h hive.h patchfile.h
 # End MODULE registry_ldb
 ################################################
 
+[SUBSYSTEM::registry_common]
+PUBLIC_DEPENDENCIES = registry
+OBJ_FILES = tools/common.o
+PRIVATE_PROTO_HEADER = tools/common.h
+
 ################################################
 # Start BINARY regdiff
 [BINARY::regdiff]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/regdiff.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+OBJ_FILES = tools/regdiff.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regdiff.1
 # End BINARY regdiff
 ################################################
@@ -114,10 +60,10 @@ MANPAGE = man/regdiff.1
 # Start BINARY regpatch
 [BINARY::regpatch]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/regpatch.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+OBJ_FILES = tools/regpatch.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
+               registry_common
 MANPAGE = man/regpatch.1
 # End BINARY regpatch
 ################################################
@@ -126,10 +72,10 @@ MANPAGE = man/regpatch.1
 # Start BINARY regshell
 [BINARY::regshell]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/regshell.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE
+OBJ_FILES = tools/regshell.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
+               SMBREADLINE registry_common
 MANPAGE = man/regshell.1
 # End BINARY regshell
 ################################################
@@ -138,10 +84,24 @@ MANPAGE = man/regshell.1
 # Start BINARY regtree
 [BINARY::regtree]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/regtree.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS
+OBJ_FILES = tools/regtree.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
+               registry_common
 MANPAGE = man/regtree.1
 # End BINARY regtree
 ################################################
+
+[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
+
+[PYTHON::swig_registry]
+PUBLIC_DEPENDENCIES = registry
+SWIG_FILE = registry.i
+