r15271: Fix --enable-dso

[samba.git] / source / build / smb_build / output.pm

diff --git a/source/build/smb_build/output.pm b/source/build/smb_build/output.pm
index 5c54feee1b43cfe7c5d1b03b4bd9c31b41752b3a..a53a9263f9772c4724b53e667f1d1b886d90649e 100644 (file)
--- a/source/build/smb_build/output.pm
+++ b/source/build/smb_build/output.pm
@@ -147,12 +147,18 @@ sub create_output($$)
        foreach $part (values %{$depend}) {
                next if not defined($part->{OUTPUT_TYPE});
 
-               # Always import the CFLAGS and CPPFLAGS of the unique dependencies
-               foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES}}) {
+               foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES_ALL}}) {
                        next if $elem == $part;
 
                        push(@{$part->{PUBLIC_CFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}});
                        push(@{$part->{PUBLIC_CFLAGS}}, $elem->{CFLAGS}) if defined($elem->{CFLAGS});
+               }
+
+
+               # Always import the CFLAGS and CPPFLAGS of the unique dependencies
+               foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES}}) {
+                       next if $elem == $part;
+
                        push(@{$part->{LINK_LIST}}, $elem->{OUTPUT}) if defined($elem->{OUTPUT});
                        push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
                        push(@{$part->{LINK_FLAGS}},@{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});