From 7dd064fcd9c41f19d43abaa9d994224b0e215edb Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 18 Feb 2008 17:08:54 +0100
Subject: Factor out common code that generates object lists. (This used to be
 commit ef14e1ab3267263d65c4c41cd3c0dab3680f4104)

---
 source4/build/smb_build/main.pl | 7 ++-----
 1 file changed, 2 insertions(+), 5 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 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};
 
-- 
cgit