summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-18 22:02:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:43 -0500
commitf200d553fb30abe75314c5be8181da2b0dc0b57d (patch)
tree250f1febb1c1d5d849c0e7c405dd121f5e6e9a0c /source4
parent4a1dd087119314a7ed3f2c3e56690a55d213fd07 (diff)
downloadsamba-f200d553fb30abe75314c5be8181da2b0dc0b57d.tar.gz
samba-f200d553fb30abe75314c5be8181da2b0dc0b57d.tar.bz2
samba-f200d553fb30abe75314c5be8181da2b0dc0b57d.zip
r14549: Use make-compatible syntax in extra_cflags.txt so we can avoid
cflags.pl when using GNU make (This used to be commit 4354147f6b5e9485d0550fa6c8a33be526f54db6)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/build/smb_build/cflags.pm5
-rwxr-xr-xsource4/script/cflags.pl6
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";