2 files changed, 147 insertions, 17 deletions
diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4
index 77508063fc..331b9c2df1 100644
--- a/source4/lib/registry/config.m4
+++ b/source4/lib/registry/config.m4
@@ -22,25 +22,23 @@ if test t$SMB_EXT_LIB_ENABLE_gtk = tYES; then
 	SMB_BINARY_ENABLE(gregedit, YES)
 fi
 
-SMB_MODULE(registry_nt4, REGISTRY, STATIC, lib/registry/reg_backend_nt4/reg_backend_nt4.o)
-SMB_MODULE(registry_w95, REGISTRY, STATIC, lib/registry/reg_backend_w95/reg_backend_w95.o)
-SMB_MODULE(registry_dir, REGISTRY, STATIC, lib/registry/reg_backend_dir/reg_backend_dir.o)
-SMB_MODULE(registry_rpc, REGISTRY, STATIC, lib/registry/reg_backend_rpc/reg_backend_rpc.o,[],[],[LIBSMB])
-SMB_MODULE(registry_gconf, REGISTRY, STATIC, lib/registry/reg_backend_gconf/reg_backend_gconf.o, [], [gconf])
-SMB_MODULE(registry_ldb, REGISTRY, NOT, lib/registry/reg_backend_ldb/reg_backend_ldb.o,[],[],[LIBLDB])
-SMB_SUBSYSTEM(REGISTRY,lib/registry/common/reg_interface.o,
-	[lib/registry/common/reg_objects.o lib/registry/common/reg_util.o],
-	[],
-	[LIBBASIC])
-
-SMB_BINARY(regdiff, [REG], [BIN], lib/registry/tools/regdiff.o,[],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])
-SMB_BINARY(regpatch, [REG], [BIN], lib/registry/tools/regpatch.o,[],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])
-SMB_BINARY(regshell, [REG], [BIN], lib/registry/tools/regshell.o,[],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])
-SMB_BINARY(regtree, [REG], [BIN], lib/registry/tools/regtree.o,[],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])
-SMB_BINARY(gregedit, [REG], [BIN], lib/registry/tools/gregedit.o,[gtk],[CONFIG LIBBASIC LIBCMDLINE REGISTRY])
+SMB_MODULE_MK(registry_nt4, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_w95, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_dir, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_rpc, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_gconf, REGISTRY, STATIC, lib/registry/config.mk)
+SMB_MODULE_MK(registry_ldb, REGISTRY, NOT, lib/registry/config.mk)
+
+SMB_SUBSYSTEM_MK(REGISTRY,lib/registry/config.mk)
+
+SMB_BINARY_MK(regdiff, lib/registry/config.mk)
+SMB_BINARY_MK(regpatch, lib/registry/config.mk)
+SMB_BINARY_MK(regshell, lib/registry/config.mk)
+SMB_BINARY_MK(regtree, lib/registry/config.mk)
+SMB_BINARY_MK(gregedit, lib/registry/config.mk)
 
 if test x"$experimental" = x"yes"; then
 	SMB_LIBRARY_ENABLE(libwinregistry, YES)
 fi
 
-SMB_LIBRARY(libwinregistry, 0, 0, 1, , , REGISTRY) 
+SMB_LIBRARY_MK(libwinregistry, lib/registry/config.mk) 
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
new file mode 100644
index 0000000000..fff5381e87
--- /dev/null
+++ b/source4/lib/registry/config.mk
@@ -0,0 +1,132 @@
+# Registry backends
+
+################################################
+# Start MODULE registry_nt4
+[MODULE::registry_nt4]
+INIT_OBJ_FILES = \
+		lib/registry/reg_backend_nt4/reg_backend_nt4.o
+# End MODULE registry_nt4
+################################################
+
+################################################
+# Start MODULE registry_w95
+[MODULE::registry_w95]
+INIT_OBJ_FILES = \
+		lib/registry/reg_backend_w95/reg_backend_w95.o
+# End MODULE registry_w95
+################################################
+
+################################################
+# Start MODULE registry_dir
+[MODULE::registry_dir]
+INIT_OBJ_FILES = \
+		lib/registry/reg_backend_dir/reg_backend_dir.o
+# End MODULE registry_dir
+################################################
+
+################################################
+# Start MODULE registry_rpc
+[MODULE::registry_rpc]
+INIT_OBJ_FILES = \
+		lib/registry/reg_backend_rpc/reg_backend_rpc.o
+REQUIRED_SUBSYSTEMS = \
+		LIBSMB
+# End MODULE registry_rpc
+################################################
+
+################################################
+# Start MODULE registry_gconf
+[MODULE::registry_gconf]
+INIT_OBJ_FILES = \
+		lib/registry/reg_backend_gconf/reg_backend_gconf.o
+REQUIRED_LIBRARIES = \
+		gconf
+# End MODULE registry_gconf
+################################################
+
+################################################
+# Start MODULE registry_ldb
+[MODULE::registry_ldb]
+INIT_OBJ_FILES = \
+		lib/registry/reg_backend_ldb/reg_backend_ldb.o
+REQUIRED_SUBSYSTEMS = \
+		LIBLDB
+# 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_objects.o \
+		lib/registry/common/reg_util.o
+REQUIRED_SUBSYSTEMS = \
+		LIBBASIC
+# 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]
+OBJ_FILES= \
+		lib/registry/tools/regdiff.o
+REQUIRED_SUBSYSTEMS = \
+		CONFIG LIBCMDLINE REGISTRY
+# End BINARY regdiff
+################################################
+
+################################################
+# Start BINARY regpatch
+[BINARY::regpatch]
+OBJ_FILES= \
+		lib/registry/tools/regpatch.o
+REQUIRED_SUBSYSTEMS = \
+		CONFIG LIBCMDLINE REGISTRY
+# End BINARY regpatch
+################################################
+
+################################################
+# Start BINARY regshell
+[BINARY::regshell]
+OBJ_FILES= \
+		lib/registry/tools/regshell.o
+REQUIRED_SUBSYSTEMS = \
+		CONFIG LIBCMDLINE REGISTRY
+# End BINARY regshell
+################################################
+
+################################################
+# Start BINARY regtree
+[BINARY::regtree]
+OBJ_FILES= \
+		lib/registry/tools/regtree.o
+REQUIRED_SUBSYSTEMS = \
+		CONFIG LIBCMDLINE REGISTRY
+# End BINARY regtree
+################################################
+
+################################################
+# Start BINARY gregedit
+[BINARY::grepedit]
+OBJ_FILES= \
+		lib/registry/tools/gregedit.o
+REQUIRED_LIBRARIES = \
+		gtk
+REQUIRED_SUBSYSTEMS = \
+		CONFIG LIBCMDLINE REGISTRY
+# End BINARY gregedit
+################################################