From patchwork Fri Nov 30 19:27:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 203025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CF9142C0086 for ; Sat, 1 Dec 2012 06:26:16 +1100 (EST) Received: from localhost ([::1]:39517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeWE2-0006DD-Kz for incoming@patchwork.ozlabs.org; Fri, 30 Nov 2012 14:26:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeWDl-0006D2-G8 for qemu-devel@nongnu.org; Fri, 30 Nov 2012 14:25:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TeWDk-0004Hp-H5 for qemu-devel@nongnu.org; Fri, 30 Nov 2012 14:25:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeWDj-0004HC-UI for qemu-devel@nongnu.org; Fri, 30 Nov 2012 14:25:56 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAUJPrP4004729 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 30 Nov 2012 14:25:53 -0500 Received: from blackpad.lan.raisama.net (vpn1-5-169.gru2.redhat.com [10.97.5.169]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAUJPpeW001750; Fri, 30 Nov 2012 14:25:52 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id 1286C200D95; Fri, 30 Nov 2012 17:27:25 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 30 Nov 2012 17:27:15 -0200 Message-Id: <1354303642-4283-4-git-send-email-ehabkost@redhat.com> In-Reply-To: <1354303642-4283-1-git-send-email-ehabkost@redhat.com> References: <1354303642-4283-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Subject: [Qemu-devel] [RFC 03/10] move -I$(SRC_PATH)/include compiler flag to Makefile.objs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 \