diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 22:25:19 +0100 |
| commit | b4017955e19723e48b41b70c7ba313dcfcda5eb9 (patch) | |
| tree | 138d37f4c9abc2dcecd38a6ba4e5c539b4927421 /source4/build/smb_build/main.pl | |
| parent | 1131d4c2545355ef793e468810655c0f72828368 (diff) | |
| parent | b136033421eb045b28f5928e4d2f9604cf704690 (diff) | |
| download | samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.gz samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.bz2 samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/input.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
(This used to be commit bc11e3ef1c34923f5b13571926617a840ad554fe)
Diffstat (limited to 'source4/build/smb_build/main.pl')
| -rw-r--r-- | source4/build/smb_build/main.pl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 3911a11773..c6031e23e6 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -18,9 +18,7 @@ use strict; my $INPUT = {}; my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk"); -my $subsys_output_type; -$subsys_output_type = ["MERGED_OBJ"]; -#$subsys_output_type = ["STATIC_LIBRARY"]; +my $subsys_output_type = ["MERGED_OBJ"]; my $library_output_type; if ($config::config{USESHARED} eq "true") { @@ -35,7 +33,7 @@ my $module_output_type; if ($config::config{USESHARED} eq "true") { $module_output_type = ["SHARED_LIBRARY"]; } else { - $module_output_type = ["INTEGRATED"]; + $module_output_type = ["MERGED_OBJ"]; } my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, @@ -43,12 +41,13 @@ my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, $library_output_type, $module_output_type); my $OUTPUT = output::create_output($DEPEND, \%config::config); -$config::config{SUBSYSTEM_OUTPUT_TYPE} = $subsys_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); my $shared_libs_used = 0; +foreach my $key (values %$OUTPUT) { + $mkenv->_prepare_list($key, "OBJ_LIST"); + push(@{$mkenv->{all_objs}}, "\$($key->{NAME}_OBJ_LIST)"); +} foreach my $key (values %$OUTPUT) { next unless defined $key->{OUTPUT_TYPE}; |