From 4deff16ddb788a4290b308fb9a51da51fc236b32 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 27 Jun 2008 15:33:36 +0200 Subject: smb_build: use MERGED_OBJ instead of STATIC_LIBRARY metze (This used to be commit 54b06a1c839a9af4565635011e3e624271769cc7) --- source4/build/smb_build/main.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/build/smb_build') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 88289af26d..f8a0cb004f 100644 --- 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") } -- cgit