summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-13 09:44:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:23:00 -0500
commitdd0816dcc8482829009928e5d0dc95ec0621e833 (patch)
tree4b407628214d96d9c6f29e518519a261ac54ffd3 /source4/build
parentbca5b59fdf1512f3acc73cacf11d1d0ba1e34f53 (diff)
downloadsamba-dd0816dcc8482829009928e5d0dc95ec0621e833.tar.gz
samba-dd0816dcc8482829009928e5d0dc95ec0621e833.tar.bz2
samba-dd0816dcc8482829009928e5d0dc95ec0621e833.zip
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)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/config_mk.pm1
-rw-r--r--source4/build/smb_build/makefile.pm6
2 files changed, 1 insertions, 6 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 2194e3d596..0ac45cfefa 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -24,7 +24,6 @@ my %attribute_types = (
"MINOR_VERSION" => "string",
"RELEASE_VERSION" => "string",
"ENABLE" => "bool",
- "TARGET_CFLAGS" => "list",
"CMD" => "string",
"MANPAGE" => "string"
);
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";