diff options
| -rwxr-xr-x | source4/build/smb_build/cflags.pm | 2 | ||||
| -rwxr-xr-x | source4/script/cflags.pl | 31 |
2 files changed, 23 insertions, 10 deletions
diff --git a/source4/build/smb_build/cflags.pm b/source4/build/smb_build/cflags.pm index ad6cd42c65..a4ab90a8cd 100755 --- a/source4/build/smb_build/cflags.pm +++ b/source4/build/smb_build/cflags.pm @@ -23,6 +23,8 @@ sub create_cflags($$$$) { open(CFLAGS_TXT,">$file") || die ("Can't open `$file'\n"); + print CFLAGS_TXT "include mkconfig.mk\n"; + my $src_ne_build = ($srcdir ne $builddir) ? 1 : 0; foreach my $key (values %{$CTX}) { diff --git a/source4/script/cflags.pl b/source4/script/cflags.pl index 7f435d46f5..f083cefb39 100755 --- a/source4/script/cflags.pl +++ b/source4/script/cflags.pl @@ -8,20 +8,31 @@ use strict; my $target = shift; -sub check_flags($) +my $vars = {}; + +sub check_flags($$) { - my ($name)=@_; - open (IN, "extra_cflags.txt"); - while (<IN> =~ /^([^:]+): (.*)$/) { - next unless (grep(/^$target$/, (split / /, $1))); - $_ = $2; - s/^CFLAGS\+=//; - print "$_ "; + my ($path, $name)=@_; + open (IN, $path); + foreach my $line (<IN>) { + if ($line =~ /^include (.*)$/) { + check_flags($1, $name); + } elsif ($line =~ /^([A-Za-z0-9_]+) = (.*)$/) { + $vars->{$1} = $2; + } elsif ($line =~ /^([^:]+): (.*)$/) { + next unless (grep(/^$target$/, (split / /, $1))); + my $data = $2; + $data =~ s/^CFLAGS\+=//; + foreach (keys %$vars) { + $data =~ s/\$($_)/$vars->{$_}/g; + } + print "$data "; + } } close(IN); - print "\n"; } -check_flags($target); +check_flags("extra_cflags.txt", $target); +print "\n"; exit 0; |