diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-11-21 14:49:35 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:46:02 +0100 |
| commit | 218fef224c558c2c6be8e67c3275c8cc27dead7e (patch) | |
| tree | 2fff1ace46b2a95541371182f9a98b2ef76fc740 /source4/build/smb_build/makefile.pm | |
| parent | dd2a4719df68519c11f115aaa8b77e7afca0a2a3 (diff) | |
| download | samba-218fef224c558c2c6be8e67c3275c8cc27dead7e.tar.gz samba-218fef224c558c2c6be8e67c3275c8cc27dead7e.tar.bz2 samba-218fef224c558c2c6be8e67c3275c8cc27dead7e.zip | |
r26097: Consider python modules special modules rather than special libraries.
(This used to be commit 4c26cf38102a67ae12b3512b5d38991f020ed2e2)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 043f13d518..cd73aeb8a7 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -310,6 +310,11 @@ sub SharedModule($$) my $sane_subsystem = lc($ctx->{SUBSYSTEM}); $sane_subsystem =~ s/^lib//; + if ($ctx->{TYPE} eq "PYTHON") { + push (@{$self->{python_dsos}}, + "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); + } + push (@{$self->{shared_modules}}, "$ctx->{TARGET_SHARED_LIBRARY}"); push (@{$self->{plugins}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); @@ -396,11 +401,6 @@ sub SharedLibrary($$) $self->_prepare_list($ctx, "LINK_FLAGS"); # $self->_prepare_list_ex($ctx, "LINK_FLAGS", "-Wl,--whole-archive", "-Wl,--no-whole-archive"); - if ($ctx->{TYPE} eq "PYTHON") { - push (@{$self->{python_dsos}}, - "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}"); - } - push(@{$self->{all_objs}}, "\$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST)"); my $soarg = ""; |