diff options
| -rwxr-xr-x | source4/build/smb_build/cflags.pm | 5 | ||||
| -rwxr-xr-x | source4/script/cflags.pl | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source4/build/smb_build/cflags.pm b/source4/build/smb_build/cflags.pm index 2cf6453841..b5525173a0 100755 --- a/source4/build/smb_build/cflags.pm +++ b/source4/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/source4/script/cflags.pl b/source4/script/cflags.pl index 476960db5d..c848b56e7d 100755 --- a/source4/script/cflags.pl +++ b/source4/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"; |