aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-03 14:46:23 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:05:39 -0500
commit6c90361a7f589a4e932fed83660423cef3073bcf (patch)
tree4531173b2284e59d866ce90fd9bf6820b8807c4a
parent867c16fd5499d8ceec6657fb820f65c181cad8c5 (diff)
move common QEMU_CFLAGS to configure
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
-rw-r--r--Makefile3
-rw-r--r--Makefile.hw4
-rw-r--r--Makefile.target4
-rwxr-xr-xconfigure3
4 files changed, 5 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index f72e989990..82ef203338 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,6 @@ endif
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
-QEMU_CFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
-QEMU_CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-QEMU_CFLAGS += -U_FORTIFY_SOURCE
LIBS+=-lz
ifdef BUILD_DOCS
diff --git a/Makefile.hw b/Makefile.hw
index 052eb1a365..139412e3cc 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -8,9 +8,7 @@ include $(SRC_PATH)/rules.mak
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
-QEMU_CFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
-QEMU_CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-QEMU_CFLAGS+=-I$(SRC_PATH)/fpu
+QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu
obj-y =
obj-y += virtio.o virtio-pci.o
diff --git a/Makefile.target b/Makefile.target
index 3efb8763b9..53a38a315f 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
-QEMU_CFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
+QEMU_CFLAGS+= -I.. -I$(TARGET_PATH) -DNEED_CPU_H
ifdef CONFIG_USER_ONLY
# user emulator name
@@ -44,8 +44,6 @@ ifeq ($(ARCH),ia64)
QEMU_CFLAGS+=-mno-sdata
endif
-QEMU_CFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-QEMU_CFLAGS+=-U_FORTIFY_SOURCE
LIBS+=-lm
ifdef CONFIG_SOLARIS
ifdef CONFIG_NEEDS_LIBSUNMATH
diff --git a/configure b/configure
index 8f89a59882..59fc842f86 100755
--- a/configure
+++ b/configure
@@ -1389,6 +1389,9 @@ if test "$debug" = "no" ; then
fi
QEMU_CFLAGS="-Wall -Wundef -Wendif-labels -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
+QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
+QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS"
+QEMU_CFLAGS="-I. -I\$(SRC_PATH) -MMD -MP -MT \$@ $QEMU_CFLAGS"
LDFLAGS="-g $LDFLAGS"
# Consult white-list to determine whether to enable werror