diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-24 20:45:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:04:20 -0500 |
| commit | 82f19553144f13e88ea58d04da15aba94059505f (patch) | |
| tree | b7d5e0c99b2c9af2a7ea9d955beed252b340a055 /source4/build/smb_build/output.pm | |
| parent | f4ad602b7023fe44e369c59a42dde947c4dba4b3 (diff) | |
| download | samba-82f19553144f13e88ea58d04da15aba94059505f.tar.gz samba-82f19553144f13e88ea58d04da15aba94059505f.tar.bz2 samba-82f19553144f13e88ea58d04da15aba94059505f.zip | |
r15223: Move heimdal's -I parameters from the global list of includes to
the subsystems in question
(This used to be commit 2fbb4d91fa580ccb64e36f0b082f23af33123b13)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index 848286946b..d344b8ef01 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -136,11 +136,6 @@ sub create_output($$) $part->{OUTPUT_TYPE} = "OBJLIST"; } - if (($part->{STANDARD_VISIBILITY} ne "default") and - ($config->{visibility_attribute} eq "yes")) { - $part->{EXTRA_CFLAGS} .= " -fvisibility=$part->{STANDARD_VISIBILITY}"; - } - generate_binary($part) if $part->{OUTPUT_TYPE} eq "BINARY"; generate_mergedobj($part) if $part->{OUTPUT_TYPE} eq "MERGEDOBJ"; generate_objlist($part) if $part->{OUTPUT_TYPE} eq "OBJLIST"; @@ -156,22 +151,22 @@ sub create_output($$) foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES}}) { next if $elem == $part; - push(@{$part->{CPPFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}}); - push(@{$part->{CFLAGS}}, @{$elem->{CFLAGS}}) if defined(@{$elem->{CFLAGS}}); + push(@{$part->{CFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}}); + push(@{$part->{CFLAGS}}, $elem->{EXTRA_CFLAGS}) if defined($elem->{EXTRA_CFLAGS}); 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}); - push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET}); - push(@{$part->{SUBSYSTEM_INIT_FUNCTIONS}}, $elem->{INIT_FUNCTION}) if - defined($elem->{INIT_FUNCTION}) and - $elem->{TYPE} ne "MODULE" and - $part->{OUTPUT_TYPE} ne "SHARED_LIBRARY"; + push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET}); } } foreach $part (values %{$depend}) { - $part->{EXTRA_CFLAGS} .= " ".join(" ", @{$part->{CFLAGS}}) if defined($part->{CFLAGS}); - $part->{EXTRA_CFLAGS} .= " ".join(" ", @{$part->{CPPFLAGS}}) if defined($part->{CPPFLAGS}); + $part->{EXTRA_CFLAGS} .= " " . join(' ', @{$part->{CFLAGS}}) if defined($part->{CFLAGS}); + $part->{EXTRA_CFLAGS} .= " " . join(' ', @{$part->{CPPFLAGS}}) if defined($part->{CPPFLAGS}); + if (($part->{STANDARD_VISIBILITY} ne "default") and + ($config->{visibility_attribute} eq "yes")) { + $part->{EXTRA_CFLAGS} .= " -fvisibility=$part->{STANDARD_VISIBILITY}"; + } } return $depend; |