summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/main.pl
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 17:08:54 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 17:08:54 +0100
commit7dd064fcd9c41f19d43abaa9d994224b0e215edb (patch)
treeea75433c8bf4383b891e52b91e28d5580b87f570 /source4/build/smb_build/main.pl
parent86be022079a1efe43604a263fa12aa73ef93efba (diff)
downloadsamba-7dd064fcd9c41f19d43abaa9d994224b0e215edb.tar.gz
samba-7dd064fcd9c41f19d43abaa9d994224b0e215edb.tar.bz2
samba-7dd064fcd9c41f19d43abaa9d994224b0e215edb.zip
Factor out common code that generates object lists.
(This used to be commit ef14e1ab3267263d65c4c41cd3c0dab3680f4104)
Diffstat (limited to 'source4/build/smb_build/main.pl')
-rw-r--r--source4/build/smb_build/main.pl7
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 4c09e32422..d4d18a5cb9 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -48,14 +48,11 @@ $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) {
- next unless defined $key->{OUTPUT_TYPE};
-
- $mkenv->Integrated($key) if grep(/INTEGRATED/, @{$key->{OUTPUT_TYPE}});
+ $mkenv->_prepare_list($key, "OBJ_LIST");
}
-my $shared_libs_used = 0;
-
foreach my $key (values %$OUTPUT) {
next unless defined $key->{OUTPUT_TYPE};