svn commit: samba r14549 - in branches/SAMBA_4_0/source: build/smb_build script

[jelmer at samba.org]

Author: jelmer
Date: 2006-03-18 22:02:31 +0000 (Sat, 18 Mar 2006)
New Revision: 14549

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14549

Log:
Use make-compatible syntax in extra_cflags.txt so we can avoid 
cflags.pl when using GNU make

Modified:
   branches/SAMBA_4_0/source/build/smb_build/cflags.pm
   branches/SAMBA_4_0/source/script/cflags.pl


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/cflags.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/cflags.pm	2006-03-18 21:13:07 UTC (rev 14548)
+++ branches/SAMBA_4_0/source/build/smb_build/cflags.pm	2006-03-18 22:02:31 UTC (rev 14549)
@@ -18,7 +18,10 @@
 		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);

Modified: branches/SAMBA_4_0/source/script/cflags.pl
===================================================================
--- branches/SAMBA_4_0/source/script/cflags.pl	2006-03-18 21:13:07 UTC (rev 14548)
+++ branches/SAMBA_4_0/source/script/cflags.pl	2006-03-18 22:02:31 UTC (rev 14549)
@@ -13,8 +13,10 @@
     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";