From bf300c868781fed3b0c0556b4e40608589ad1585 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 26 Oct 2005 13:19:15 +0000 Subject: r11300: Treat libraries as a special kind of subsystem (one that can also be built as a library and installed). (This used to be commit 98d1f9b1dc523ed88c5aa8d066030b33d74f62bf) --- source4/build/smb_build/main.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 3643c2d89a..35e29ecb0e 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -28,12 +28,12 @@ if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})) { } if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) { - $smb_build::input::subsystem_output_type = $ENV{LIBRARY_OUTPUT_TYPE}; + $smb_build::input::library_output_type = $ENV{LIBRARY_OUTPUT_TYPE}; } elsif ($config::config{BLDSHARED} eq "true") { # FIXME: This should really be SHARED_LIBRARY - $smb_build::input::subsystem_output_type = "MERGEDOBJ"; + $smb_build::input::library_output_type = "MERGEDOBJ"; } elsif ($config::config{BLDMERGED} eq "true") { - $smb_build::input::subsystem_output_type = "MERGEDOBJ"; + $smb_build::input::library_output_type = "MERGEDOBJ"; } my $DEPEND = smb_build::input::check($INPUT, \%config::enabled); -- cgit