summaryrefslogtreecommitdiff
path: root/source4/build/smb_build/output.pm
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-26 16:31:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:02 -0500
commite28c03aeecef54fb0488c868a86177994788969e (patch)
treee8fe94cad86ef42dc1f728c7a07f2d85b8204879 /source4/build/smb_build/output.pm
parentbd556984f4bc984cef096a0d8e31311fa901ecfe (diff)
downloadsamba-e28c03aeecef54fb0488c868a86177994788969e.tar.gz
samba-e28c03aeecef54fb0488c868a86177994788969e.tar.bz2
samba-e28c03aeecef54fb0488c868a86177994788969e.zip
r15287: Simplify dependency detection code
(This used to be commit 28a1919ed37f47337f8a53c39b9261a74c5c1bfc)
Diffstat (limited to 'source4/build/smb_build/output.pm')
-rw-r--r--source4/build/smb_build/output.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index a53a9263f9..de122ee9a0 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -147,7 +147,8 @@ sub create_output($$)
foreach $part (values %{$depend}) {
next if not defined($part->{OUTPUT_TYPE});
- foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES_ALL}}) {
+ foreach (@{$part->{UNIQUE_DEPENDENCIES_ALL}}) {
+ my $elem = $depend->{$_};
next if $elem == $part;
push(@{$part->{PUBLIC_CFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}});
@@ -156,7 +157,8 @@ sub create_output($$)
# Always import the CFLAGS and CPPFLAGS of the unique dependencies
- foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES}}) {
+ foreach (@{$part->{UNIQUE_DEPENDENCIES}}) {
+ my $elem = $depend->{$_};
next if $elem == $part;
push(@{$part->{LINK_LIST}}, $elem->{OUTPUT}) if defined($elem->{OUTPUT});