From patchwork Fri Nov 30 19:27:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC, 03/10] move -I$(SRC_PATH)/include compiler flag to Makefile.objs Date: Fri, 30 Nov 2012 09:27:15 -0000 From: Eduardo Habkost X-Patchwork-Id: 203025 Message-Id: <1354303642-4283-4-git-send-email-ehabkost@redhat.com> To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori The flag is necessary for code that doesn't use the variables from Makefile (but use Makefile.objs), like libcacard/ and stubs/. Signed-off-by: Eduardo Habkost --- Makefile | 1 - Makefile.objs | 15 +++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9ecbcbb..739d9cd 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,6 @@ audio/audio.o audio/fmodaudio.o: QEMU_CFLAGS += $(FMOD_CFLAGS) QEMU_CFLAGS+=$(CURL_CFLAGS) -QEMU_CFLAGS += -I$(SRC_PATH)/include ui/cocoa.o: ui/cocoa.m diff --git a/Makefile.objs b/Makefile.objs index 3c7abca..0a0a33a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -1,4 +1,13 @@ ####################################################################### +# general compiler flags + +QEMU_CFLAGS += $(GLIB_CFLAGS) +QEMU_CFLAGS += -I$(SRC_PATH)/include + +vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) +vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) + +####################################################################### # Stub library, linked in tools stub-obj-y = stubs/ @@ -236,12 +245,6 @@ universal-obj-y += $(qapi-obj-y) qga-obj-y = qga/ qemu-ga.o module.o qemu-tool.o qga-obj-$(CONFIG_POSIX) += qemu-sockets.o qemu-option.o -vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) - -vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) - -QEMU_CFLAGS+=$(GLIB_CFLAGS) - nested-vars += \ stub-obj-y \ qga-obj-y \