diff options
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/m4/public.m4 | 2 | ||||
| -rwxr-xr-x | source4/build/smb_build/cflags.pm | 6 | ||||
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 10 | ||||
| -rw-r--r-- | source4/build/smb_build/input.pm | 4 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 10 |
5 files changed, 16 insertions, 16 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 8e1645166c..6e8be7fa5e 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -114,7 +114,7 @@ SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS # Start Ext Lib $1 @<:@EXT_LIB::EXT_LIB_$1@:>@ LIBS = $2 -EXTRA_CFLAGS = $3 +CFLAGS = $3 CPPFLAGS = $4 LDFLAGS = $5 # End Ext Lib $1 diff --git a/source4/build/smb_build/cflags.pm b/source4/build/smb_build/cflags.pm index 299cbab025..6dfe4fe94e 100755 --- a/source4/build/smb_build/cflags.pm +++ b/source4/build/smb_build/cflags.pm @@ -14,15 +14,15 @@ sub create_cflags($$) foreach my $key (values %{$CTX}) { next unless defined ($key->{OBJ_LIST}); - next unless defined ($key->{EXTRA_CFLAGS}); - next if ($key->{EXTRA_CFLAGS} eq ""); + next unless defined ($key->{CFLAGS}); + next if ($key->{CFLAGS} eq ""); foreach (@{$key->{OBJ_LIST}}) { my $ofile = $_; my $dfile = $_; $dfile =~ s/\.o$/.d/; $dfile =~ s/\.ho$/.d/; - print CFLAGS_TXT "$ofile $dfile: CFLAGS+=$key->{EXTRA_CFLAGS}\n"; + print CFLAGS_TXT "$ofile $dfile: CFLAGS+=$key->{CFLAGS}\n"; } } close(CFLAGS_TXT); diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 6dfd105c25..7250735b53 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -15,7 +15,7 @@ use strict; my $section_types = { "EXT_LIB" => { "LIBS" => "list", - "EXTRA_CFLAGS" => "string", + "CFLAGS" => "string", "CPPFLAGS" => "list", "LDFLAGS" => "list", }, @@ -34,7 +34,7 @@ my $section_types = { "PUBLIC_HEADERS" => "list", - "EXTRA_CFLAGS" => "string", + "CFLAGS" => "string", "STANDARD_VISIBILITY" => "string" }, "MODULE" => { @@ -55,7 +55,7 @@ my $section_types = { "MANPAGE" => "string", "PRIVATE_PROTO_HEADER" => "string", - "EXTRA_CFLAGS" => "string" + "CFLAGS" => "string" }, "BINARY" => { "OBJ_FILES" => "list", @@ -70,7 +70,7 @@ my $section_types = { "PUBLIC_PROTO_HEADER" => "string", "PUBLIC_HEADERS" => "list", - "EXTRA_CFLAGS" => "string", + "CFLAGS" => "string", "STANDARD_VISIBILITY" => "string" }, "LIBRARY" => { @@ -96,7 +96,7 @@ my $section_types = { "PUBLIC_PROTO_HEADER" => "string", "PRIVATE_PROTO_HEADER" => "string", - "EXTRA_CFLAGS" => "string", + "CFLAGS" => "string", "STANDARD_VISIBILITY" => "string" } }; diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 697f706a0c..488ac5c6ec 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -155,8 +155,8 @@ sub check($$$$$) } } - unless (defined($part->{EXTRA_CFLAGS})) { - $part->{EXTRA_CFLAGS} = ""; + unless (defined($part->{CFLAGS})) { + $part->{CFLAGS} = ""; } unless (defined($part->{PUBLIC_HEADERS})) { 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}"; } } |