14 files changed, 28 insertions, 6 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index c5a8786b6f..0bbff5b09a 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -106,3 +106,5 @@ PUBLIC_HEADERS += auth/auth.h
 PUBLIC_DEPENDENCIES = auth_system_session
 PRIVATE_DEPENDENCIES = SAMDB 
 SWIG_FILE = auth.i
+
+swig_auth_OBJ_FILES = auth/auth_wrap.o
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index 146f004397..d8c02ebea8 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -14,3 +14,5 @@ PUBLIC_HEADERS += $(addprefix auth/credentials/, credentials.h credentials_krb5.
 [PYTHON::swig_credentials]
 PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS
 SWIG_FILE = credentials.i
+
+swig_credentials_OBJ_FILES = auth/credentials/credentials_wrap.o
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index cd7b7ba2ac..66a0bc723e 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -151,7 +151,6 @@ sub check_python($$$)
 		$dirname .= "/" unless $dirname =~ /\/$/;
 		$dirname = "" if $dirname eq "./";
 
-		$python->{OBJ_FILES} = ["$dirname$basename\_wrap.o"];
 		$python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)";
 		$python->{PYTHON_FILES} = ["$dirname$basename.py"];
 		push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_UNUSED_MACROS)");
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 58c9f20670..ffab456d68 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -65,11 +65,9 @@ sub generate_merged_obj($)
 	my $link_name = $lib->{NAME};
 	$link_name =~ s/^LIB//;
 
-	if (defined($lib->{OBJ_FILES})) {
-		$lib->{MERGED_OBJNAME} = lc($link_name).".o";
-		$lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}";
-		$lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ};
-	}
+	$lib->{MERGED_OBJNAME} = lc($link_name).".o";
+	$lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}";
+	$lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ};
 }
 
 sub generate_static_library($)
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index ba06c2f673..e5a1316c47 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -45,3 +45,5 @@ PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
 [PYTHON::swig_events]
 SWIG_FILE = events.i
 PRIVATE_DEPENDENCIES = LIBEVENTS
+
+swig_events_OBJ_FILES = lib/events/events_wrap.o
diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index bbd4c1c5eb..448cc3ed60 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -2,3 +2,5 @@
 PUBLIC_DEPENDENCIES = LIBLDB
 CFLAGS = -Ilib/ldb/include
 SWIG_FILE = ldb.i
+
+swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 728d64d552..544201ad53 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -104,3 +104,4 @@ torture_registry_OBJ_FILES = $(addprefix lib/registry/tests/, generic.o hive.o d
 PUBLIC_DEPENDENCIES = registry
 SWIG_FILE = registry.i
 
+swig_registry_OBJ_FILES = lib/registry/registry_wrap.o
diff --git a/source4/lib/tdb/python.mk b/source4/lib/tdb/python.mk
index 23b01c120c..2d61545b7f 100644
--- a/source4/lib/tdb/python.mk
+++ b/source4/lib/tdb/python.mk
@@ -1,3 +1,5 @@
 [PYTHON::swig_tdb]
 SWIG_FILE = tdb.i
 PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG
+
+swig_tdb_OBJ_FILES = lib/tdb/tdb_wrap.o
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index d6a340a599..abef6e3192 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -58,10 +58,14 @@ LIBCLI_NBT_OBJ_FILES = $(addprefix libcli/nbt/, \
 SWIG_FILE = swig/libcli_nbt.i
 PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-CONFIG
 
+python_libcli_nbt_OBJ_FILES = libcli/swig/libcli_nbt_wrap.o
+
 [PYTHON::python_libcli_smb]
 SWIG_FILE = swig/libcli_smb.i
 PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-CONFIG
 
+python_libcli_smb_OBJ_FILES = libcli/swig/libcli_smb_wrap.o
+
 [SUBSYSTEM::LIBCLI_DGRAM]
 PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE
 
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 7d36846262..fde065aa34 100644
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -10,3 +10,5 @@ LIBSECURITY_OBJ_FILES = $(addprefix libcli/security/, \
 [PYTHON::swig_security]
 SWIG_FILE = security.i
 PRIVATE_DEPENDENCIES = LIBSECURITY
+
+swig_security_OBJ_FILES = libcli/security/security_wrap.o
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk
index 0dbe981bdd..f7ff07a7bc 100644
--- a/source4/libnet/config.mk
+++ b/source4/libnet/config.mk
@@ -19,3 +19,5 @@ PUBLIC_HEADERS += $(addprefix libnet/, libnet.h libnet_join.h libnet_lookup.h li
 [PYTHON::swig_net]
 PRIVATE_DEPENDENCIES = LIBSAMBA-NET
 SWIG_FILE = net.i
+
+swig_net_OBJ_FILES = libnet/net_wrap.o
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 071d19cb15..2d26f97add 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -708,6 +708,8 @@ 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
+
 [PYTHON::python_echo]
 PRIVATE_DEPENDENCIES = RPC_NDR_ECHO
 
diff --git a/source4/param/config.mk b/source4/param/config.mk
index 219ac3fe2d..4b5af9b6cb 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -53,3 +53,5 @@ SECRETS_OBJ_FILES = param/secrets.o
 [PYTHON::param]
 SWIG_FILE = param.i
 PRIVATE_DEPENDENCIES = LIBSAMBA-CONFIG
+
+param_OBJ_FILES = param/param_wrap.o
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 8a3a637bf5..a0f5caad3b 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -18,6 +18,8 @@ python_uuid_OBJ_FILES = scripting/python/uuidmodule.o
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
+python_misc_OBJ_FILES = scripting/python/misc_wrap.o
+
 _PY_FILES = $(shell find scripting/python -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst scripting/python/%,%,$(pyfile)),$(pyfile))))