From 6c3ff9acd104dd0d55db41c3e049f3fe329c2e5d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 25 Feb 2008 18:29:04 +0100
Subject: Include CFLAGS overrides in make file. (This used to be commit
 f05d5f839e18e078a59ccd262fbffaa2eb4e3672)

---
 source4/build/smb_build/main.pl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'source4/build/smb_build/main.pl')

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 924f94762c..86bbb44a8b 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -10,7 +10,6 @@ use smb_build::input;
 use smb_build::config_mk;
 use smb_build::output;
 use smb_build::env;
-use smb_build::cflags;
 use smb_build::summary;
 use smb_build::config;
 use strict;
@@ -71,7 +70,8 @@ foreach my $key (values %$OUTPUT) {
 	$mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
 	if ($key->{TYPE} eq "MODULE" and defined($key->{INIT_FUNCTION})) {
 		$mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS += \"$key->{INIT_FUNCTION},\"\n");
-		}
+	}
+	$mkenv->CFlags($key);
 }
 
 foreach my $key (values %$OUTPUT) {
@@ -97,9 +97,6 @@ foreach my $key (values %$OUTPUT) {
 
 $mkenv->write("data.mk");
 
-cflags::create_cflags($OUTPUT, $config::config{srcdir},
-		    $config::config{builddir}, "extra_cflags.txt");
-
 summary::show($OUTPUT, \%config::config);
 
 if ($shared_libs_used) {
-- 
cgit