r14549: Use make-compatible syntax in extra_cflags.txt so we can avoid

cflags.pl when using GNU make

diff --git a/source/build/smb_build/cflags.pm b/source/build/smb_build/cflags.pm
index 2cf64538415ae6c804bdefe8363c99fbec76b860..b5525173a07d346e7ea062beb4174aaec1f620ec 100755 (executable)
--- a/source/build/smb_build/cflags.pm
+++ b/source/build/smb_build/cflags.pm
@@ -18,7 +18,10 @@ sub create_cflags($$)
                next if ($key->{EXTRA_CFLAGS} eq "");
 
                foreach (@{$key->{OBJ_LIST}}) {
-                       print CFLAGS_TXT "$_: $key->{EXTRA_CFLAGS}\n";
+                       my $ofile = $_;
+                       my $dfile = $_;
+                       $dfile =~ s/\.o$/.d/;
+                       print CFLAGS_TXT "$ofile $dfile: CFLAGS+=$key->{EXTRA_CFLAGS}\n";
                }
        }
        close(CFLAGS_TXT);

diff --git a/source/script/cflags.pl b/source/script/cflags.pl
index 476960db5db84a396a7cd86647b0a97fe86cc913..c848b56e7d0c0ddd55828b8dbfdef6c76b17be14 100755 (executable)
--- a/source/script/cflags.pl
+++ b/source/script/cflags.pl
@@ -13,8 +13,10 @@ sub check_flags($)
     my ($name)=@_;
        open (IN, "extra_cflags.txt");
     while (<IN> =~ /^([^:]+): (.*)$/) {
-               next unless ($1 eq $target);
-               print "$2 ";
+               next unless (grep(/^$target$/, (split / /, $1)));
+               $_ = $2;
+               s/^CFLAGS\+=//;
+               print "$_ ";
        }
        close(IN);
        print "\n";