Merge branch 'v4-0-trivial' into v4-0-gmake3

[kai/samba.git] / source4 / build / smb_build / main.pl

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 0717cd9b0bb5d875b4d259526cb1eddecd48e512..3911a117734b9b7efbdda8b2c0bf3112e30e728c 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -19,8 +19,8 @@ my $INPUT = {};
 my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
 
 my $subsys_output_type;
-#$subsys_output_type = ["MERGED_OBJ"];
-$subsys_output_type = ["STATIC_LIBRARY"];
+$subsys_output_type = ["MERGED_OBJ"];
+#$subsys_output_type = ["STATIC_LIBRARY"];
 
 my $library_output_type;
 if ($config::config{USESHARED} eq "true") {