From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 27 Jun 2008 13:33:36 +0000 (+0200)
Subject: smb_build: use MERGED_OBJ instead of STATIC_LIBRARY
X-Git-Tag: samba-4.0.0alpha5^2~3^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54b06a1c839a9af4565635011e3e624271769cc7;p=thirdparty%2Fsamba.git

smb_build: use MERGED_OBJ instead of STATIC_LIBRARY

metze
---

diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index 88289af26d8..f8a0cb004fe 100644
--- a/source/build/smb_build/main.pl
+++ b/source/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")
 }