diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-21 00:53:06 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-21 00:53:06 +0100 |
| commit | bd41b4579c26f40f55811b332874ddeca3478e24 (patch) | |
| tree | 027944bd31b2122829b2732cca2f415774ab5504 | |
| parent | c1a9b68623a663c36451df31aa44fe5f0e22af17 (diff) | |
| download | samba-bd41b4579c26f40f55811b332874ddeca3478e24.tar.gz samba-bd41b4579c26f40f55811b332874ddeca3478e24.tar.bz2 samba-bd41b4579c26f40f55811b332874ddeca3478e24.zip | |
Avoid linking in all Python modules to the samba binaries - we can just let Python dlopen() them.
| -rw-r--r-- | source4/build/smb_build/input.pm | 2 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 2 | ||||
| -rw-r--r-- | source4/param/config.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 1696a364b2..df9a525f4f 100644 --- 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 7871a93604..8fe4bb5ee0 100644 --- 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 6af9dab5d9..18354ea219 100644 --- 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 |