smb_build: use MERGED_OBJ instead of STATIC_LIBRARY

metze
(This used to be commit 54b06a1c839a9af4565635011e3e624271769cc7)

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 88289af26d8ca28133162330ae7449e588a02671..f8a0cb004fea1b79f20a24b375f0638b15443be2 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -32,9 +32,9 @@ my $subsys_output_type = ["MERGED_OBJ"];
 
 my $library_output_type;
 if ($config::config{USESHARED} eq "true") {
-       $library_output_type = ["SHARED_LIBRARY", "STATIC_LIBRARY"];
+       $library_output_type = ["SHARED_LIBRARY", "MERGED_OBJ"];
 } else {
-       $library_output_type = ["STATIC_LIBRARY"];
+       $library_output_type = ["MERGED_OBJ"];
        push (@$library_output_type, "SHARED_LIBRARY") if 
                                                ($config::config{BLDSHARED} eq "true")
 }