diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 21:46:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:07 -0500 |
| commit | b00c2369069c41880598ff430776cc26e8f7b916 (patch) | |
| tree | fe483e7721681d6f5ffc0271a15366a615e260c9 /source4/build/smb_build/main.pl | |
| parent | ab8fd44603c6ac140e6d0c29fd6a1a1065f616a3 (diff) | |
| download | samba-b00c2369069c41880598ff430776cc26e8f7b916.tar.gz samba-b00c2369069c41880598ff430776cc26e8f7b916.tar.bz2 samba-b00c2369069c41880598ff430776cc26e8f7b916.zip | |
r15301: Use static libraries internally. This required a few hacks in the build
system - these should be removed later on.
(This used to be commit 06547391669e064d2b92f5841b7df5f101a34cb9)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index ec4ad0995e..61c9214086 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -23,10 +23,8 @@ my $subsystem_output_type; if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})) { $subsystem_output_type = $ENV{SUBSYSTEM_OUTPUT_TYPE}; -} elsif ($config::config{BLDMERGED} eq "true") { - $subsystem_output_type = "MERGEDOBJ"; } else { - $subsystem_output_type = "OBJ_LIST"; + $subsystem_output_type = "STATIC_LIBRARY"; } my $library_output_type; @@ -34,10 +32,8 @@ if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) { $library_output_type = $ENV{LIBRARY_OUTPUT_TYPE}; } elsif ($config::config{BLDSHARED} eq "true") { $library_output_type = "SHARED_LIBRARY"; -} elsif ($config::config{BLDMERGED} eq "true") { - $library_output_type = "MERGEDOBJ"; } else { - $library_output_type = "OBJ_LIST"; + $library_output_type = "STATIC_LIBRARY"; } my $module_output_type; @@ -67,8 +63,6 @@ foreach my $key (values %$OUTPUT) { foreach my $key (values %$OUTPUT) { next unless defined $key->{OUTPUT_TYPE}; - $mkenv->MergedObj($key) if $key->{OUTPUT_TYPE} eq "MERGEDOBJ"; - $mkenv->ObjList($key) if $key->{OUTPUT_TYPE} eq "OBJLIST"; $mkenv->StaticLibrary($key) if $key->{OUTPUT_TYPE} eq "STATIC_LIBRARY"; $mkenv->PkgConfig($key) if ($key->{OUTPUT_TYPE} eq "SHARED_LIBRARY") and defined($key->{VERSION}); |