From patchwork Tue Oct 12 13:00:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 67564 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9AA55B6F10 for ; Wed, 13 Oct 2010 00:25:35 +1100 (EST) Received: from localhost ([127.0.0.1]:40784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P5erE-0003D4-Gx for incoming@patchwork.ozlabs.org; Tue, 12 Oct 2010 09:25:32 -0400 Received: from [140.186.70.92] (port=41055 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P5eUN-0007Zq-Sy for qemu-devel@nongnu.org; Tue, 12 Oct 2010 09:02:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P5eUG-0004nP-HO for qemu-devel@nongnu.org; Tue, 12 Oct 2010 09:01:55 -0400 Received: from mail-qw0-f45.google.com ([209.85.216.45]:52643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P5eUG-0004Mc-F0 for qemu-devel@nongnu.org; Tue, 12 Oct 2010 09:01:48 -0400 Received: by mail-qw0-f45.google.com with SMTP id 5so1841033qwh.4 for ; Tue, 12 Oct 2010 06:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:subject:date :message-id:x-mailer:in-reply-to:references; bh=pvAzsJ4ifwPmxI/ETgmP5Ch4H2bxxNt/bimmJDLa91M=; b=DBuucF+jBBXP7B2BI3FjoQykFwSdyoz2DnjyKcoEMY7EXl1yAI8N6V7TdUfeR4bZKO L4LBKcgZ/VmoP9ZAT6iIBLp6c6WP2ElrSyDroL8qNb9zKoxf8lwacqLMl4lmXGB3nF60 4jYuL+9a6WV+r/KE8haTbalFcu31tzWowvZHs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=vwhnY5EGzBt6FvR3ctQsHKdzTS/cjAuhZjW2WfRSyPGmRE10gMyc22fxWdxjD9Ls9i ASZXVrx4JqRiEBbwAO8E44WdzGQw25Tx5xifwUCQgn353BgeD10sLLZec1CaPnE0MTfj 0mvQhH0AaOIvCO7Nod9aW6TzwC6PzY5ZM7obs= Received: by 10.224.196.196 with SMTP id eh4mr5673910qab.344.1286888498455; Tue, 12 Oct 2010 06:01:38 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com [209.132.186.34]) by mx.google.com with ESMTPS id s34sm5931078qcp.20.2010.10.12.06.01.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 12 Oct 2010 06:01:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 12 Oct 2010 15:00:35 +0200 Message-Id: <1286888457-5033-18-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1286888457-5033-1-git-send-email-pbonzini@redhat.com> References: <1286888457-5033-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 17/39] introduce CPPFLAGS configure variable X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Be consistent with Autoconf-generated scripts. Signed-off-by: Paolo Bonzini --- configure | 8 ++++++++ rules.mak | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 2a2f64e..7f2e2a4 100755 --- a/configure +++ b/configure @@ -189,6 +189,8 @@ for opt do ;; CFLAGS=*) CFLAGS="$CFLAGS" ;; + CPPFLAGS=*) CPPFLAGS="$CFLAGS" + ;; LDFLAGS=*) LDFLAGS="$LDFLAGS" ;; --extra-cflags=*) QEMU_CFLAGS="$optarg $QEMU_CFLAGS" @@ -523,6 +525,8 @@ for opt do ;; --install=*) install="$optarg" ;; + CPPFLAGS=*) + ;; CFLAGS=*|--extra-cflags=*) ;; LDFLAGS=*|--extra-ldflags=*) @@ -925,6 +929,8 @@ echo " --extra-ldflags=LDFLAGS append extra linker flags LDFLAGS" echo "" echo "Some influential environment variables can be passed on the command line:" echo " CFLAGS C compiler flags" +echo " CPPFLAGS C preprocessor flags, e.g. -I if you have" +echo " headers in a nonstandard directory " echo " LDFLAGS linker flags, e.g. -L if you have libraries in a" echo " nonstandard directory " echo "" @@ -2284,6 +2290,7 @@ fi echo "Source path $source_path" echo "C compiler $cc" echo "CFLAGS $CFLAGS" +echo "CPPFLAGS $CPPFLAGS" echo "QEMU_CFLAGS $QEMU_CFLAGS" echo "LDFLAGS $LDFLAGS" echo "make $make" @@ -2650,6 +2657,7 @@ echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak echo "WINDRES=$windres" >> $config_host_mak echo "CFLAGS=$CFLAGS" >> $config_host_mak +echo "CPPFLAGS=$CPPFLAGS" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak echo "QEMU_CPPFLAGS=$QEMU_CPPFLAGS" >> $config_host_mak if test "$sparse" = "yes" ; then diff --git a/rules.mak b/rules.mak index 007fc49..b4b7e16 100644 --- a/rules.mak +++ b/rules.mak @@ -15,15 +15,15 @@ MAKEFLAGS += -rR QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d %.o: %.c - $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_CPPFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_CPPFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<," CC $(TARGET_DIR)$@") %.o: %.S - $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_CPPFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_CPPFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<," AS $(TARGET_DIR)$@") %.o: %.m - $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_CPPFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@") + $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_CPPFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@") -LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(1) $(LIBS)," LINK $(TARGET_DIR)$@") +LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(QEMU_CPPFLAGS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $(1) $(LIBS)," LINK $(TARGET_DIR)$@") %$(EXESUF): %.o $(call LINK,$^)