summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-19 04:37:09 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-19 04:37:09 +0100
commita153e7081c92ca851b6f1284d15d00de632bff78 (patch)
tree10a79d9c7302b94f561aa57bcb24583ead8ddb20 /source4
parent12e08782b3bef67395d9508fed9487d0217174d6 (diff)
parent9368ea67cdbb0d1fe5ef2258cc7e8c20c66e6ecd (diff)
downloadsamba-a153e7081c92ca851b6f1284d15d00de632bff78.tar.gz
samba-a153e7081c92ca851b6f1284d15d00de632bff78.tar.bz2
samba-a153e7081c92ca851b6f1284d15d00de632bff78.zip
Merge branch 'v4-0-trivial' into v4-0-kvmtest
(This used to be commit 2b8d5db1bb21ab3deaa8edbaddceaf23f83b8180)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/output.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 83be28e740..ff9afe8e8c 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -185,7 +185,7 @@ sub create_output($$)
merge_array(\$part->{FINAL_CFLAGS}, $part->{CPPFLAGS});
merge_array(\$part->{FINAL_CFLAGS}, $part->{CFLAGS});
- foreach (@{$part->{UNIQUE_DEPENDENCIES_COMPILE}}) {
+ foreach (@{$part->{UNIQUE_DEPENDENCIES_ALL}}) {
my $elem = $depend->{$_};
next if $elem == $part;