Avoid linking in all Python modules to the samba binaries - we can just let Python...

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 1696a364b28e5de41362f1594251068b4f810dd2..df9a525f4f6e84210a0d92ac8aff8c9db0656a1a 100644 (file)
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -108,7 +108,7 @@ sub check_module($$$)
                push (@{$mod->{PUBLIC_DEPENDENCIES}}, $mod->{SUBSYSTEM});
                add_libreplace($mod);
        } 
-       if (grep(/MERGED_OBJ/, @{$mod->{OUTPUT_TYPE}})) {
+       if (grep(/MERGED_OBJ/, @{$mod->{OUTPUT_TYPE}}) and $mod->{TYPE} ne "PYTHON") {
                push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
                push (@{$INPUT->{$mod->{SUBSYSTEM}}{PRIVATE_DEPENDENCIES}}, $mod->{NAME});
        }

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 7871a93604afa418118310f9f88725242da98cbf..8fe4bb5ee0651b41201403a8f4de7ddfb9606b61 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -648,7 +648,7 @@ python_echo_OBJ_FILES = ../librpc/gen_ndr/py_echo.o
 
 [PYTHON::python_winreg]
 LIBRARY_REALNAME = samba/dcerpc/winreg.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = RPC_NDR_WINREG python_misc PYTALLOC param swig_credentials python_dcerpc_misc python_lsa python_dcerpc
+PRIVATE_DEPENDENCIES = RPC_NDR_WINREG PYTALLOC param swig_credentials python_dcerpc_misc python_lsa python_dcerpc
 
 python_winreg_OBJ_FILES = ../librpc/gen_ndr/py_winreg.o
 

diff --git a/source4/param/config.mk b/source4/param/config.mk
index 6af9dab5d9c3cacc6e11043a88684138bdc37336..18354ea2195fe515cbb1ce1119ce55ad60a4bd3d 100644 (file)
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -13,7 +13,7 @@ PUBLIC_HEADERS += param/param.h
 PC_FILES += $(paramsrcdir)/samba-hostconfig.pc
 
 [SUBSYSTEM::PROVISION]
-PRIVATE_DEPENDENCIES = LIBPYTHON swig_ldb
+PRIVATE_DEPENDENCIES = LIBPYTHON swig_ldb param
 
 PROVISION_OBJ_FILES = $(paramsrcdir)/provision.o