diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-11-21 11:10:45 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:45:50 +0100 |
| commit | 5256d93a458d0f653afa788bb8f8d894dd1a25b2 (patch) | |
| tree | 8a618f3a269e57e59af73f77a71c58bbfc380865 /source4/build/smb_build/main.pl | |
| parent | 6b62805ce7db000420752f56b0544d2aecc51833 (diff) | |
| download | samba-5256d93a458d0f653afa788bb8f8d894dd1a25b2.tar.gz samba-5256d93a458d0f653afa788bb8f8d894dd1a25b2.tar.bz2 samba-5256d93a458d0f653afa788bb8f8d894dd1a25b2.zip | |
r26067: Merge improvements building Python modules.
(This used to be commit 11a2cbbac51781e72ae1288c8e30f175526b01a8)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 3ac5c26e1a..de639eb36b 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -62,7 +62,8 @@ 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" and + $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY" or + $key->{TYPE} eq "PYTHON") and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); if ($key->{TYPE} eq "LIBRARY" and ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") { @@ -71,6 +72,7 @@ foreach my $key (values %$OUTPUT) { $mkenv->SharedModule($key) if $key->{TYPE} eq "MODULE" and grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}}); + $mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES}); $mkenv->Manpage($key) if defined($key->{MANPAGE}); $mkenv->Header($key) if defined($key->{PUBLIC_HEADERS}); $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or |