13 files changed, 22 insertions, 11 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 7d31a6a0c0..0162653076 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -41,4 +41,6 @@ PUBLIC_DEPENDENCIES = auth_system_session
 PRIVATE_DEPENDENCIES = SAMDB 
 SWIG_FILE = auth.i
 
+$(eval $(call python_py_module_template,auth.py,$(authsrcdir)/auth.py))
+
 swig_auth_OBJ_FILES = $(authsrcdir)/auth_wrap.o
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index d71a8238a5..fc01f7eddc 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -17,4 +17,6 @@ PUBLIC_HEADERS += $(authsrcdir)/credentials/credentials.h
 PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS
 SWIG_FILE = credentials.i
 
+$(eval $(call python_py_module_template,credentials.py,$(authsrcdir)/credentials/credentials.py))
+
 swig_credentials_OBJ_FILES = $(authsrcdir)/credentials/credentials_wrap.o
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 7028d2ab17..75a02ca8c2 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -146,7 +146,6 @@ sub check_python($$$)
 		$dirname = "" if $dirname eq "./";
 
 		$python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)";
-		$python->{PYTHON_FILES} = ["$dirname$basename.py"];
 		push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_UNUSED_MACROS)");
 		push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_CAST_QUAL)");
 		$python->{INIT_FUNCTION} = "{ (char *)\"_$basename\", init_$basename }";
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index b31bfaa1f2..88289af26d 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -70,7 +70,6 @@ foreach my $key (values %$OUTPUT) {
 	    ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") {
 		$shared_libs_used = 1;
 	}
-	$mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES});
 	if ($key->{TYPE} eq "MODULE" and @{$key->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ" and defined($key->{INIT_FUNCTION})) {
 		$mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS += $key->{INIT_FUNCTION},\n");
 	}
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index a0fee2736b..0269cfe8a3 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -214,15 +214,6 @@ $self->output("\$(call binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NA
 	}
 }
 
-sub PythonFiles($$)
-{
-	my ($self,$ctx) = @_;
-
-	foreach (@{$ctx->{PYTHON_FILES}}) {
-		$self->output("\$(eval \$(call python_py_module_template," . basename($_) . ",\$(addprefix $ctx->{BASEDIR}/, $_)))\n");
-	}
-}
-
 sub write($$)
 {
 	my ($self, $file) = @_;
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 3a20770427..e4b5f40571 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -56,3 +56,5 @@ SWIG_FILE = events.i
 PRIVATE_DEPENDENCIES = LIBEVENTS LIBSAMBA-HOSTCONFIG
 
 swig_events_OBJ_FILES = $(libeventssrcdir)/events_wrap.o
+
+$(eval $(call python_py_module_template,events.py,$(libeventssrcdir)/events.py))
diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 448cc3ed60..aeafb830d6 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -4,3 +4,5 @@ CFLAGS = -Ilib/ldb/include
 SWIG_FILE = ldb.i
 
 swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
+
+$(eval $(call python_py_module_template,ldb.py,lib/ldb/ldb.py))
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index c0ad613c52..bb939be0c5 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -109,3 +109,5 @@ PUBLIC_DEPENDENCIES = registry
 SWIG_FILE = registry.i
 
 swig_registry_OBJ_FILES = $(libregistrysrcdir)/registry_wrap.o
+
+$(eval $(call python_py_module_template,registry.py,lib/registry/registry.py))
diff --git a/source4/lib/tdb/python.mk b/source4/lib/tdb/python.mk
index 2d61545b7f..51074c8576 100644
--- a/source4/lib/tdb/python.mk
+++ b/source4/lib/tdb/python.mk
@@ -3,3 +3,5 @@ SWIG_FILE = tdb.i
 PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG
 
 swig_tdb_OBJ_FILES = lib/tdb/tdb_wrap.o
+
+$(eval $(call python_py_module_template,tdb.py,lib/tdb/tdb.py))
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 16e23430d7..d7e4e143c0 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -80,12 +80,16 @@ PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG
 
 python_libcli_nbt_OBJ_FILES = $(libclisrcdir)/swig/libcli_nbt_wrap.o
 
+$(eval $(call python_py_module_template,libcli_nbt.py,$(libclisrcdir)/swig/libcli_nbt.py))
+
 [PYTHON::python_libcli_smb]
 SWIG_FILE = swig/libcli_smb.i
 PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-HOSTCONFIG
 
 python_libcli_smb_OBJ_FILES = $(libclisrcdir)/swig/libcli_smb_wrap.o
 
+$(eval $(call python_py_module_template,libcli_smb.py,$(libclisrcdir)/swig/libcli_smb.py))
+
 [SUBSYSTEM::LIBCLI_DGRAM]
 PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE LIBCLI_NETLOGON
 
diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk
index 63e54fac8a..9f704e9592 100644
--- a/source4/libcli/security/config.mk
+++ b/source4/libcli/security/config.mk
@@ -12,3 +12,5 @@ SWIG_FILE = security.i
 PRIVATE_DEPENDENCIES = LIBSECURITY
 
 swig_security_OBJ_FILES = $(libclisrcdir)/security/security_wrap.o
+
+$(eval $(call python_py_module_template,security.py,$(libclisrcdir)/security/security.py))
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 69dafb34c6..5ef64d6b75 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -727,6 +727,8 @@ PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG dcer
 
 swig_dcerpc_OBJ_FILES = $(dcerpcsrcdir)/dcerpc_wrap.o
 
+$(eval $(call python_py_module_template,dcerpc.py,$(dcerpcsrcdir)/dcerpc.py))
+
 [PYTHON::python_echo]
 PRIVATE_DEPENDENCIES = RPC_NDR_ECHO PYTALLOC param swig_credentials 
 
diff --git a/source4/param/config.mk b/source4/param/config.mk
index a25dd32194..74b19d3d1d 100644
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -62,3 +62,5 @@ SWIG_FILE = param.i
 PRIVATE_DEPENDENCIES = LIBSAMBA-HOSTCONFIG
 
 param_OBJ_FILES = $(paramsrcdir)/param_wrap.o
+
+$(eval $(call python_py_module_template,param.py,$(paramsrcdir)/param.py))