summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-06-27 15:33:36 +0200
committerStefan Metzmacher <metze@samba.org>2008-06-30 09:25:29 +0200
commit4deff16ddb788a4290b308fb9a51da51fc236b32 (patch)
tree7dbf2b7b65ad5dc345a5338a3237c8e92ce4016a
parentb438d59eb5ed5a064b28f7fa1cb3edc2a731d6c3 (diff)
downloadsamba-4deff16ddb788a4290b308fb9a51da51fc236b32.tar.gz
samba-4deff16ddb788a4290b308fb9a51da51fc236b32.tar.bz2
samba-4deff16ddb788a4290b308fb9a51da51fc236b32.zip
smb_build: use MERGED_OBJ instead of STATIC_LIBRARY
metze (This used to be commit 54b06a1c839a9af4565635011e3e624271769cc7)
-rw-r--r--source4/build/smb_build/main.pl4
1 files changed, 2 insertions, 2 deletions
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")
}