[Qemu-devel] [PATCH 32/42] move common CFLAGS to configure

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile        |    3 ---
 Makefile.hw     |    4 +---
 Makefile.target |    4 +---
 configure       |    3 +++
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 62848f1..22daabe 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,6 @@ endif

 VPATH=$(SRC_PATH):$(SRC_PATH)/hw

-CFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
-CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CFLAGS += -U_FORTIFY_SOURCE
 LIBS+=-lz

 ifdef BUILD_DOCS
diff --git a/Makefile.hw b/Makefile.hw
index 804ace1..6e21b6b 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -8,9 +8,7 @@ include $(SRC_PATH)/rules.mak

 VPATH=$(SRC_PATH):$(SRC_PATH)/hw

-CFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
-CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CFLAGS+=-I$(SRC_PATH)/fpu
+CFLAGS+=-I.. -I$(SRC_PATH)/fpu

 obj-y =
 obj-y += virtio.o virtio-pci.o
diff --git a/Makefile.target b/Makefile.target
index f53bee2..344d8f8 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -3,7 +3,7 @@ include $(SRC_PATH)/rules.mak

 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
-CFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
+CFLAGS+= -I.. -I$(TARGET_PATH) -DNEED_CPU_H

 ifdef CONFIG_USER_ONLY
 # user emulator name
@@ -44,8 +44,6 @@ ifeq ($(ARCH),ia64)
 CFLAGS+=-mno-sdata
 endif

-CFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CFLAGS+=-U_FORTIFY_SOURCE
 LIBS+=-lm
 ifdef CONFIG_SOLARIS
 ifdef CONFIG_NEEDS_LIBSUNMATH
diff --git a/configure b/configure
index 7f4ebff..18fe664 100755
--- a/configure
+++ b/configure
@@ -1388,6 +1388,9 @@ if test "$debug" = "no" ; then
 fi
 CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes 
$CFLAGS"
 CFLAGS="-Wstrict-prototypes -Wredundant-decls $CFLAGS"
+CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $CFLAGS"
+CFLAGS="-U_FORTIFY_SOURCE $CFLAGS"
+CFLAGS="-I. -I\$(SRC_PATH) -MMD -MP -MT \$@ $CFLAGS"
 LDFLAGS="-g $LDFLAGS"

 # Consult white-list to determine whether to enable werror
-- 
1.6.2.5