r21297: Remove the GTK+ tools and library from the main repository. They are now...

[bbaumbach/samba-autobuild/.git] / source4 / lib / registry / config.mk

diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index d0939c720b33aede907178c212eb94beba85e628..8d6761e6c721b41f34533793402c5428f0c2a49c 100644 (file)
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -4,29 +4,36 @@
 # Start MODULE registry_nt4
 [MODULE::registry_nt4]
 INIT_FUNCTION = registry_nt4_init
-SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
-               lib/registry/reg_backend_nt4.o
-REQUIRED_SUBSYSTEMS = TDR_REGF
+SUBSYSTEM = registry
+OBJ_FILES = \
+               reg_backend_nt4.o
+PUBLIC_DEPENDENCIES = TDR_REGF
 # End MODULE registry_nt4
 ################################################
 
 [SUBSYSTEM::TDR_REGF]
-REQUIRED_SUBSYSTEMS = TDR 
-NOPROTO = YES
-INIT_OBJ_FILES = lib/registry/tdr_regf.o
+PUBLIC_DEPENDENCIES = TDR 
+OBJ_FILES = tdr_regf.o
 
+# Special support for external builddirs
 lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
-lib/registry/tdr_regf.c: lib/registry/regf.idl
-       @./pidl/pidl --header --outputdir=lib/registry --parse --tdr-header --tdr-parser -- lib/registry/regf.idl
+$(srcdir)/lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
+lib/registry/tdr_regf.h: lib/registry/tdr_regf.c
+lib/registry/tdr_regf.c: $(srcdir)/lib/registry/regf.idl
+       @CPP="$(CPP)" $(PERL) $(srcdir)/pidl/pidl $(PIDL_ARGS) \
+               --header --outputdir=lib/registry \
+               --tdr-parser -- $(srcdir)/lib/registry/regf.idl
+
+clean::
+       @-rm -f lib/registry/regf.h lib/registry/tdr_regf*
 
 ################################################
 # Start MODULE registry_w95
 [MODULE::registry_w95]
 INIT_FUNCTION = registry_w95_init
-SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
-               lib/registry/reg_backend_w95.o
+SUBSYSTEM = registry
+OBJ_FILES = \
+               reg_backend_w95.o
 # End MODULE registry_w95
 ################################################
 
@@ -34,9 +41,10 @@ INIT_OBJ_FILES = \
 # Start MODULE registry_dir
 [MODULE::registry_dir]
 INIT_FUNCTION = registry_dir_init
-SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
-               lib/registry/reg_backend_dir.o
+SUBSYSTEM = registry
+OBJ_FILES = \
+               reg_backend_dir.o
+PUBLIC_DEPENDENCIES = LIBTALLOC
 # End MODULE registry_dir
 ################################################
 
@@ -44,10 +52,12 @@ INIT_OBJ_FILES = \
 # Start MODULE registry_rpc
 [MODULE::registry_rpc]
 INIT_FUNCTION = registry_rpc_init
-SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
-               lib/registry/reg_backend_rpc.o
-REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG
+PUBLIC_PROTO_HEADER = reg_backend_rpc.h
+OUTPUT_TYPE = INTEGRATED
+SUBSYSTEM = registry
+OBJ_FILES = \
+               reg_backend_rpc.o
+PUBLIC_DEPENDENCIES = RPC_NDR_WINREG
 # End MODULE registry_rpc
 ################################################
 
@@ -57,10 +67,10 @@ REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG
 # Start MODULE registry_gconf
 [MODULE::registry_gconf]
 INIT_FUNCTION = registry_gconf_init
-SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
-               lib/registry/reg_backend_gconf.o
-REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
+SUBSYSTEM = registry
+OBJ_FILES = \
+               reg_backend_gconf.o
+PUBLIC_DEPENDENCIES = gconf
 # End MODULE registry_gconf
 ################################################
 
@@ -68,48 +78,40 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
 # Start MODULE registry_ldb
 [MODULE::registry_ldb]
 INIT_FUNCTION = registry_ldb_init
-SUBSYSTEM = REGISTRY
-INIT_OBJ_FILES = \
-               lib/registry/reg_backend_ldb.o
-REQUIRED_SUBSYSTEMS = \
-               LIBLDB
+SUBSYSTEM = registry
+OBJ_FILES = \
+               reg_backend_ldb.o
+PUBLIC_DEPENDENCIES = \
+               ldb
 # End MODULE registry_ldb
 ################################################
 
 ################################################
-# Start SUBSYSTEM REGISTRY
-[SUBSYSTEM::REGISTRY]
-INIT_OBJ_FILES = \
-               lib/registry/common/reg_interface.o
-ADD_OBJ_FILES = \
-               lib/registry/common/reg_util.o \
-               lib/registry/reg_samba.o
-REQUIRED_SUBSYSTEMS = \
-               LIBBASIC
+# Start SUBSYSTEM registry
+[LIBRARY::registry]
+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
+PUBLIC_DEPENDENCIES = \
+               LIBSAMBA-UTIL CHARSET
+PUBLIC_PROTO_HEADER = registry_proto.h
+PUBLIC_HEADERS = registry.h
 # End MODULE registry_ldb
 ################################################
 
-################################################
-# Start LIBRARY libwinregistry
-[LIBRARY::libwinregistry]
-MAJOR_VERSION = 0
-MINOR_VERSION = 0
-RELEASE_VERSION = 1
-REQUIRED_SUBSYSTEMS = \
-               REGISTRY
-#
-# End LIBRARY libwinregistry
-################################################
-
 ################################################
 # Start BINARY regdiff
 [BINARY::regdiff]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               lib/registry/tools/regdiff.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBCMDLINE REGISTRY
-MANPAGE = lib/registry/man/regdiff.1
+OBJ_FILES = tools/regdiff.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+MANPAGE = man/regdiff.1
 # End BINARY regdiff
 ################################################
 
@@ -117,11 +119,10 @@ MANPAGE = lib/registry/man/regdiff.1
 # Start BINARY regpatch
 [BINARY::regpatch]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               lib/registry/tools/regpatch.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBCMDLINE REGISTRY
-MANPAGE = lib/registry/man/regpatch.1
+OBJ_FILES = tools/regpatch.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+MANPAGE = man/regpatch.1
 # End BINARY regpatch
 ################################################
 
@@ -129,11 +130,11 @@ MANPAGE = lib/registry/man/regpatch.1
 # Start BINARY regshell
 [BINARY::regshell]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               lib/registry/tools/regshell.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBCMDLINE REGISTRY
-MANPAGE = lib/registry/man/regshell.1
+OBJ_FILES = tools/regshell.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
+               SMBREADLINE
+MANPAGE = man/regshell.1
 # End BINARY regshell
 ################################################
 
@@ -141,10 +142,9 @@ MANPAGE = lib/registry/man/regshell.1
 # Start BINARY regtree
 [BINARY::regtree]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               lib/registry/tools/regtree.o
-REQUIRED_SUBSYSTEMS = \
-               CONFIG LIBCMDLINE REGISTRY
-MANPAGE = lib/registry/man/regtree.1
+OBJ_FILES = tools/regtree.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS
+MANPAGE = man/regtree.1
 # End BINARY regtree
 ################################################