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 9cc8c93450fd0f6f181844c01f8a5f1ba015d5da..8d6761e6c721b41f34533793402c5428f0c2a49c 100644 (file)
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -7,22 +7,22 @@ INIT_FUNCTION = registry_nt4_init
 SUBSYSTEM = registry
 OBJ_FILES = \
                reg_backend_nt4.o
-REQUIRED_SUBSYSTEMS = TDR_REGF
+PUBLIC_DEPENDENCIES = TDR_REGF
 # End MODULE registry_nt4
 ################################################
 
 [SUBSYSTEM::TDR_REGF]
-REQUIRED_SUBSYSTEMS = TDR 
+PUBLIC_DEPENDENCIES = TDR 
 OBJ_FILES = tdr_regf.o
 
 # Special support for external builddirs
-lib/registry/reg_backend_nt4.c: $(srcdir)/lib/registry/reg_backend_nt4.c
+lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
 $(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 -- $^
+               --tdr-parser -- $(srcdir)/lib/registry/regf.idl
 
 clean::
        @-rm -f lib/registry/regf.h lib/registry/tdr_regf*
@@ -44,7 +44,7 @@ INIT_FUNCTION = registry_dir_init
 SUBSYSTEM = registry
 OBJ_FILES = \
                reg_backend_dir.o
-REQUIRED_SUBSYSTEMS = LIBTALLOC
+PUBLIC_DEPENDENCIES = LIBTALLOC
 # End MODULE registry_dir
 ################################################
 
@@ -52,12 +52,12 @@ REQUIRED_SUBSYSTEMS = LIBTALLOC
 # Start MODULE registry_rpc
 [MODULE::registry_rpc]
 INIT_FUNCTION = registry_rpc_init
-PRIVATE_PROTO_HEADER = reg_backend_rpc.h
-OUTPUT_TYPE = MERGEDOBJ
+PUBLIC_PROTO_HEADER = reg_backend_rpc.h
+OUTPUT_TYPE = INTEGRATED
 SUBSYSTEM = registry
 OBJ_FILES = \
                reg_backend_rpc.o
-REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG
+PUBLIC_DEPENDENCIES = RPC_NDR_WINREG
 # End MODULE registry_rpc
 ################################################
 
@@ -70,7 +70,7 @@ INIT_FUNCTION = registry_gconf_init
 SUBSYSTEM = registry
 OBJ_FILES = \
                reg_backend_gconf.o
-REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
+PUBLIC_DEPENDENCIES = gconf
 # End MODULE registry_gconf
 ################################################
 
@@ -81,7 +81,7 @@ INIT_FUNCTION = registry_ldb_init
 SUBSYSTEM = registry
 OBJ_FILES = \
                reg_backend_ldb.o
-REQUIRED_SUBSYSTEMS = \
+PUBLIC_DEPENDENCIES = \
                ldb
 # End MODULE registry_ldb
 ################################################
@@ -97,9 +97,9 @@ OBJ_FILES = \
                common/reg_util.o \
                reg_samba.o \
                patchfile.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSAMBA-UTIL
-PRIVATE_PROTO_HEADER = registry_proto.h
+PUBLIC_DEPENDENCIES = \
+               LIBSAMBA-UTIL CHARSET
+PUBLIC_PROTO_HEADER = registry_proto.h
 PUBLIC_HEADERS = registry.h
 # End MODULE registry_ldb
 ################################################
@@ -108,9 +108,8 @@ PUBLIC_HEADERS = registry.h
 # Start BINARY regdiff
 [BINARY::regdiff]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/regdiff.o
-REQUIRED_SUBSYSTEMS = \
+OBJ_FILES = tools/regdiff.o
+PRIVATE_DEPENDENCIES = \
                LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regdiff.1
 # End BINARY regdiff
@@ -120,9 +119,8 @@ MANPAGE = man/regdiff.1
 # Start BINARY regpatch
 [BINARY::regpatch]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/regpatch.o
-REQUIRED_SUBSYSTEMS = \
+OBJ_FILES = tools/regpatch.o
+PRIVATE_DEPENDENCIES = \
                LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regpatch.1
 # End BINARY regpatch
@@ -132,10 +130,10 @@ MANPAGE = man/regpatch.1
 # Start BINARY regshell
 [BINARY::regshell]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/regshell.o
-REQUIRED_SUBSYSTEMS = \
-               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE
+OBJ_FILES = tools/regshell.o
+PRIVATE_DEPENDENCIES = \
+               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
+               SMBREADLINE
 MANPAGE = man/regshell.1
 # End BINARY regshell
 ################################################
@@ -144,9 +142,8 @@ MANPAGE = man/regshell.1
 # Start BINARY regtree
 [BINARY::regtree]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-               tools/regtree.o
-REQUIRED_SUBSYSTEMS = \
+OBJ_FILES = tools/regtree.o
+PRIVATE_DEPENDENCIES = \
                LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS
 MANPAGE = man/regtree.1
 # End BINARY regtree