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/main.pl | |
| 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/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index de639eb36b..e084d48a77 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -62,14 +62,14 @@ foreach my $key (values %$OUTPUT) { $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->PkgConfig($key, $OUTPUT) if $key->{TYPE} eq "LIBRARY" and defined($key->{VERSION}); - $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY" or - $key->{TYPE} eq "PYTHON") and + $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); if ($key->{TYPE} eq "LIBRARY" and ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") { $shared_libs_used = 1; } - $mkenv->SharedModule($key) if $key->{TYPE} eq "MODULE" and + $mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" or + $key->{TYPE} eq "PYTHON") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES}); |