Deal with subsystems with no settings, several other minor fixes.

(This used to be commit 10cf48591e8d6bfb750a6ff187f04ea24a1f8cd7)

7 files changed, 13 insertions, 9 deletions

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index e7fb7f5729..c5e0ac5a74 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -216,6 +216,9 @@ sub run_config_mk($$$$)
 		{
 			$section = $1;
 			$infragment = 0;
+
+			$result->{$section}{EXISTS}{KEY} = "EXISTS";
+			$result->{$section}{EXISTS}{VAL} = 1;
 			next;
 		}
 
@@ -273,6 +276,7 @@ sub run_config_mk($$$$)
 		$input->{$name}{BASEDIR} = $basedir;
 
 		foreach my $key (values %{$result->{$section}}) {
+			next if ($key->{KEY} eq "EXISTS");
 			$key->{VAL} = smb_build::input::strtrim($key->{VAL});
 			my $vartype = $sectype->{$key->{KEY}};
 			if (not defined($vartype)) {
diff --git a/source4/cluster/ctdb/config.mk b/source4/cluster/ctdb/config.mk
index 2ec8187ea3..01c639d142 100644
--- a/source4/cluster/ctdb/config.mk
+++ b/source4/cluster/ctdb/config.mk
@@ -2,13 +2,13 @@
 [SUBSYSTEM::brlock_ctdb]
 PUBLIC_DEPENDENCIES = ctdb
 
-brlock_ctdb_OBJ_FILES = brlock_ctdb.o
+brlock_ctdb_OBJ_FILES = cluster/ctdb/brlock_ctdb.o
 
 ##################
 [SUBSYSTEM::opendb_ctdb]
 PUBLIC_DEPENDENCIES = ctdb
 
-opendb_ctdb_OBJ_FILES = opendb_ctdb.o
+opendb_ctdb_OBJ_FILES = cluster/ctdb/opendb_ctdb.o
 
 ##################
 [SUBSYSTEM::ctdb]
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index a0d8a537b4..1708c66d44 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -268,7 +268,7 @@ SUBSYSTEM = LIBLDB
 # End MODULE ldb_subtree_rename
 ################################################
 
-ldb_subtree_delete_OBJ_FILES = subtree_delete.o
+ldb_subtree_delete_OBJ_FILES = dsdb/samdb/ldb_modules/subtree_delete.o
 
 ################################################
 # Start MODULE ldb_linked_attributes
diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk
index d6d229e943..70fb289189 100644
--- a/source4/lib/policy/config.mk
+++ b/source4/lib/policy/config.mk
@@ -11,4 +11,4 @@ lib/policy/parse_adm.h: lib/policy/parse_adm.c
 [BINARY::dumpadm]
 PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-CONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET
 
-dumpadmin_OBJ_FILES = lib/policy/dumpadm.o
+dumpadm_OBJ_FILES = lib/policy/dumpadm.o
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 2d26f97add..708ff50a45 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -708,7 +708,7 @@ RPC_EJS_IRPC_OBJ_FILES = librpc/gen_ndr/ndr_irpc_ejs.o
 SWIG_FILE = rpc/dcerpc.i
 PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
 
-swig_dcerpc_OBJ_FILES = librpc/dcerpc_wrap.o
+swig_dcerpc_OBJ_FILES = librpc/rpc/dcerpc_wrap.o
 
 [PYTHON::python_echo]
 PRIVATE_DEPENDENCIES = RPC_NDR_ECHO
diff --git a/source4/ntptr/config.mk b/source4/ntptr/config.mk
index 4ccf57af99..dda4c29444 100644
--- a/source4/ntptr/config.mk
+++ b/source4/ntptr/config.mk
@@ -21,6 +21,6 @@ PUBLIC_DEPENDENCIES = DCERPC_COMMON
 # End SUBSYSTEM ntptr
 ################################################
 
-NTPTR_OBJ_FILES = \
-		ntptr_base.o \
-		ntptr_interface.o
+ntptr_OBJ_FILES = \
+		ntptr/ntptr_base.o \
+		ntptr/ntptr_interface.o
diff --git a/source4/ntvfs/common/config.mk b/source4/ntvfs/common/config.mk
index 99a8a7af45..356f6465c3 100644
--- a/source4/ntvfs/common/config.mk
+++ b/source4/ntvfs/common/config.mk
@@ -7,5 +7,5 @@ PRIVATE_DEPENDENCIES = brlock_ctdb opendb_ctdb
 # End LIBRARY ntvfs_common
 ################################################
 
-NTVFS_COMMON_OBJ_FILES = $(addprefix ntvfs/common/, init.o brlock.o brlock_tdb.o opendb.o opendb_tdb.o notify.o)
+ntvfs_common_OBJ_FILES = $(addprefix ntvfs/common/, init.o brlock.o brlock_tdb.o opendb.o opendb_tdb.o notify.o)