Support building .so versions of the modules.

(This used to be commit 673fb9c1855f9d61d4d311bcd5e3fea0210fe6ed)

1 files changed, 3 insertions, 6 deletions

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 3d715a513e..7a6988515c 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -61,9 +61,6 @@ foreach my $key (values %$OUTPUT) {
 	    ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") {
 		$shared_libs_used = 1;
 	}
-	$mkenv->SharedModulePrimitives($key) if ($key->{TYPE} eq "MODULE" or 
-								   $key->{TYPE} eq "PYTHON") and
-					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 	$mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES});
 	$mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
 	if ($key->{TYPE} eq "MODULE" and @{$key->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ" and defined($key->{INIT_FUNCTION})) {
@@ -84,9 +81,9 @@ foreach my $key (values %$OUTPUT) {
 	$mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
 	$mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and
 					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
-	$mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" or 
-								   $key->{TYPE} eq "PYTHON") and
-					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
+	$mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" and
+					grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}));
+	$mkenv->PythonModule($key) if ($key->{TYPE} eq "PYTHON");
 	$mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}});
 	$mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or 
 					 defined($key->{PUBLIC_PROTO_HEADER});