diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-14 16:22:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:47 -0500 |
| commit | 8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71 (patch) | |
| tree | 8e8ccaddb94efc6a85ab6c339cab76cea1f44085 /source4/lib/registry | |
| parent | 7367d23713a34a6c29a492adb365292399adffe8 (diff) | |
| download | samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.gz samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.bz2 samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.zip | |
r3733: More build system fixes/features:
- Use .mk files directly (no need for a SMB_*_MK() macro when adding a new SUBSYSTEM, MODULE or BINARY). This allows addition of new modules and subsystems without running configure
- Add support for generating .dot files with the Samba4 dependency tree (as used by the graphviz and springgraph utilities)
(This used to be commit 64826da834e26ee0488674e27a0eae36491ee179)
Diffstat (limited to 'source4/lib/registry')
| -rw-r--r-- | source4/lib/registry/config.m4 | 16 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 6 |
2 files changed, 6 insertions, 16 deletions
diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4 index f3681e7828..abadcbe1a0 100644 --- a/source4/lib/registry/config.m4 +++ b/source4/lib/registry/config.m4 @@ -15,22 +15,6 @@ if test t$SMB_EXT_LIB_ENABLE_gconf = tYES; then SMB_MODULE_DEFAULT(registry_gconf, STATIC) fi -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, STATIC, 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) - if test x"$experimental" = x"yes"; then SMB_LIBRARY_ENABLE(libwinregistry, YES) fi - -SMB_LIBRARY_MK(libwinregistry, lib/registry/config.mk) diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index bebd8bf1d7..1a12b0ade6 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -4,6 +4,7 @@ # Start MODULE registry_nt4 [MODULE::registry_nt4] INIT_FUNCTION = registry_nt4_init +SUBSYSTEM = REGISTRY INIT_OBJ_FILES = \ lib/registry/reg_backend_nt4/reg_backend_nt4.o # End MODULE registry_nt4 @@ -13,6 +14,7 @@ INIT_OBJ_FILES = \ # Start MODULE registry_w95 [MODULE::registry_w95] INIT_FUNCTION = registry_w95_init +SUBSYSTEM = REGISTRY INIT_OBJ_FILES = \ lib/registry/reg_backend_w95/reg_backend_w95.o # End MODULE registry_w95 @@ -22,6 +24,7 @@ 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/reg_backend_dir.o # End MODULE registry_dir @@ -31,6 +34,7 @@ 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/reg_backend_rpc.o REQUIRED_SUBSYSTEMS = \ @@ -42,6 +46,7 @@ REQUIRED_SUBSYSTEMS = \ # Start MODULE registry_gconf [MODULE::registry_gconf] INIT_FUNCTION = registry_gconf_init +SUBSYSTEM = REGISTRY INIT_OBJ_FILES = \ lib/registry/reg_backend_gconf/reg_backend_gconf.o REQUIRED_SUBSYSTEMS = EXT_LIB_gconf @@ -52,6 +57,7 @@ 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/reg_backend_ldb.o REQUIRED_SUBSYSTEMS = \ |