From dd0816dcc8482829009928e5d0dc95ec0621e833 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 13 Jul 2005 09:44:55 +0000
Subject: r8416: added the extra_cflags.txt system from smb-build

this removes the need for recursive make for heimdal, which is a big
win. It should also make it easier/cleaner to build ldb/tdb/appweb etc
in both in-tree and out-of-tree forms by allowing us to specify
different CFLAGS (and thus different include paths) per directory or
file
(This used to be commit b2f9b8aa32426198aa21a703ab4f1d59fb77e512)
---
 source4/build/smb_build/makefile.pm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'source4/build/smb_build/makefile.pm')

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 2f15274a14..337b3ae907 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -234,7 +234,7 @@ sub _prepare_std_CC_rule($$$$$)
 # $comment
 .$src.$dst:
 	\@echo $message \$\*.$src
-	\@\$(CC) \$(TARGET_CFLAGS) \$(CFLAGS) $flags -c \$< -o \$\@
+	\@\$(CC) `script/cflags.sh \$\@` \$(CFLAGS) $flags -c \$< -o \$\@
 \@BROKEN_CC\@	-mv `echo \$\@ | sed 's%^.*/%%g'` \$\@
 
 __EOD__
@@ -402,10 +402,6 @@ sub _prepare_objlist_rule($)
 
 	$output .= "$ctx->{TARGET}: ";
 
-	if (defined ($ctx->{TARGET_CFLAGS})) {
-		$output .= "\n\t@\$(MAKE) TARGET_CFLAGS=\"" . join(' ', @{$ctx->{TARGET_CFLAGS}}) . "\" ";
-	} 
-
 	$output .= "\$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJS)\n";
 	$output .= "\t\@touch $ctx->{TARGET}\n";
 
-- 
cgit