diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-26 11:30:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:04:59 -0500 |
| commit | f5bc4a72c56a8d74bfa0f334890fac9b3ea3f37e (patch) | |
| tree | f42d4992f7aa4b9fb029181fd93cb80eac8ed9d4 /source4/build/smb_build/output.pm | |
| parent | 91631d9b90c7422debb59b45b13bee9b6caba832 (diff) | |
| download | samba-f5bc4a72c56a8d74bfa0f334890fac9b3ea3f37e.tar.gz samba-f5bc4a72c56a8d74bfa0f334890fac9b3ea3f37e.tar.bz2 samba-f5bc4a72c56a8d74bfa0f334890fac9b3ea3f37e.zip | |
r15270: Rename EXTRA_CFLAGS to CFLAGS - initial work on getting DSO's working again.
(This used to be commit 33e4b92c46f272478b3c9e433f910dbbaab52af8)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index d344b8ef01..5c54feee1b 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -151,8 +151,8 @@ sub create_output($$) foreach my $elem (values %{$part->{UNIQUE_DEPENDENCIES}}) { next if $elem == $part; - push(@{$part->{CFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}}); - push(@{$part->{CFLAGS}}, $elem->{EXTRA_CFLAGS}) if defined($elem->{EXTRA_CFLAGS}); + push(@{$part->{PUBLIC_CFLAGS}}, @{$elem->{CPPFLAGS}}) if defined(@{$elem->{CPPFLAGS}}); + push(@{$part->{PUBLIC_CFLAGS}}, $elem->{CFLAGS}) if defined($elem->{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}); @@ -161,11 +161,11 @@ sub create_output($$) } 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->{CFLAGS} .= " " . join(' ', @{$part->{PUBLIC_CFLAGS}}) if defined($part->{PUBLIC_CFLAGS}); + $part->{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}"; + $part->{CFLAGS} .= " -fvisibility=$part->{STANDARD_VISIBILITY}"; } } |