diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-15 15:59:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:24 -0500 |
| commit | f8be4e8a4fd853d97c5f3188e93747314618323a (patch) | |
| tree | 5aedacafd011823c86cb29486169a9724ecb3978 /source4/build/smb_build/main.pl | |
| parent | 6589e93b1b8a61860931a171a0306b270597e1f2 (diff) | |
| download | samba-f8be4e8a4fd853d97c5f3188e93747314618323a.tar.gz samba-f8be4e8a4fd853d97c5f3188e93747314618323a.tar.bz2 samba-f8be4e8a4fd853d97c5f3188e93747314618323a.zip | |
r12253: Automatically build seperate binaries without -rpath to install when
using shared libraries and developer mode is enabled.
(This used to be commit 507bee76dc26b048ead317ec5e10a9deb1ff7f09)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 0c027facc3..cb25fca4ac 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -18,34 +18,48 @@ my $INPUT = {}; my $mkfile = smb_build::config_mk::run_config_mk($INPUT, "main.mk"); +my $subsystem_output_type; + if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})) { - $smb_build::input::subsystem_output_type = $ENV{SUBSYSTEM_OUTPUT_TYPE}; + $subsystem_output_type = $ENV{SUBSYSTEM_OUTPUT_TYPE}; } elsif ($config::config{BLDMERGED} eq "true") { - $smb_build::input::subsystem_output_type = "MERGEDOBJ"; + $subsystem_output_type = "MERGEDOBJ"; +} else { + $subsystem_output_type = "OBJ_LIST"; } +my $library_output_type; if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) { - $smb_build::input::library_output_type = $ENV{LIBRARY_OUTPUT_TYPE}; + $library_output_type = $ENV{LIBRARY_OUTPUT_TYPE}; } elsif ($config::config{BLDSHARED} eq "true") { #FIXME: This should eventually become SHARED_LIBRARY # rather then MERGEDOBJ once I'm certain it works ok -- jelmer - $smb_build::input::library_output_type = "MERGEDOBJ"; + $library_output_type = "MERGEDOBJ"; } elsif ($config::config{BLDMERGED} eq "true") { - $smb_build::input::library_output_type = "MERGEDOBJ"; + $library_output_type = "MERGEDOBJ"; +} else { + $library_output_type = "OBJ_LIST"; } +my $module_output_type; if (defined($ENV{"MODULE_OUTPUT_TYPE"})) { - $smb_build::input::module_output_type = $ENV{MODULE_OUTPUT_TYPE}; + $module_output_type = $ENV{MODULE_OUTPUT_TYPE}; } elsif ($config::config{BLDSHARED} eq "true") { #FIXME: This should eventually become SHARED_LIBRARY # rather then MERGEDOBJ once I'm certain it works ok -- jelmer - $smb_build::input::module_output_type = "MERGEDOBJ"; + $module_output_type = "MERGEDOBJ"; } elsif ($config::config{BLDMERGED} eq "true") { - $smb_build::input::module_output_type = "MERGEDOBJ"; + $module_output_type = "MERGEDOBJ"; +} else { + $module_output_type = "OBJ_LIST"; } -my $DEPEND = smb_build::input::check($INPUT, \%config::enabled); +my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, + $subsystem_output_type, $library_output_type, $module_output_type); my $OUTPUT = output::create_output($DEPEND); +$config::config{SUBSYSTEM_OUTPUT_TYPE} = $subsystem_output_type; +$config::config{LIBRARY_OUTPUT_TYPE} = $library_output_type; +$config::config{MODULE_OUTPUT_TYPE} = $module_output_type; my $mkenv = new smb_build::makefile(\%config::config, $mkfile); foreach my $key (values %$OUTPUT) { |