From patchwork Fri May 9 21:03:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 347538 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D028E140076 for ; Sat, 10 May 2014 07:06:14 +1000 (EST) Received: from localhost ([::1]:54438 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wirzg-0001YM-LX for incoming@patchwork.ozlabs.org; Fri, 09 May 2014 17:06:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WirxY-0006G6-Am for qemu-devel@nongnu.org; Fri, 09 May 2014 17:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WirxS-0005bJ-Vo for qemu-devel@nongnu.org; Fri, 09 May 2014 17:04:00 -0400 Received: from mail-ee0-x234.google.com ([2a00:1450:4013:c00::234]:45897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WirxS-0005bA-OT for qemu-devel@nongnu.org; Fri, 09 May 2014 17:03:54 -0400 Received: by mail-ee0-f52.google.com with SMTP id e53so2997780eek.39 for ; Fri, 09 May 2014 14:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=04Qj8ZMkIBYihKZCrAU1+01o/TF9GB5WyjaUq1mMpwg=; b=DriCbMQ4UHUfqOG+iqxGr4tcKAylsQzWEsywZLwSIQb481OM+xMSYCuINJW1fT/hJl 5mPIhXwhFAnNMDwzEjFp4VnWlflMgYvO1SdzUC4ZkS/M2bdtkGRm+/qD/eRZytSPcOCX 5ofRBK69SqgfuG8fIfNZ/Dku//0fYFhgJUxl8FNJhjDf9oHp8eBFIsgormbqkUI3X/6k YhuL38lPogADQAjWLDqLnohyeivXNjRDoaA0O+IwGII+wnBRtHCnsdmzVHB/Tx/86ZGa 6YCbgnpbZAuYLDltLwuhpZFndPDynPdrWwZBoZKH0RKhXAh6N+ZIyVr0FoAJth4JKV1W TrPQ== X-Received: by 10.14.225.132 with SMTP id z4mr16022639eep.92.1399669433913; Fri, 09 May 2014 14:03:53 -0700 (PDT) Received: from playground.lan (net-37-117-141-58.cust.vodafonedsl.it. [37.117.141.58]) by mx.google.com with ESMTPSA id u46sm13823876eel.1.2014.05.09.14.03.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 May 2014 14:03:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 9 May 2014 23:03:36 +0200 Message-Id: <1399669424-29676-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1399669424-29676-1-git-send-email-pbonzini@redhat.com> References: <1399669424-29676-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::234 Cc: mjt@tls.msk.ru Subject: [Qemu-devel] [PULL 02/10] build: simplify Makefile.target a bit, use just one rule for softmmu 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 From: Michael Tokarev On win*, we build QEMU_PROGW (GUI) and create a console app QEMU_PROG from it, while on non-win*, we make only QEMU_PROG using the same rules as used for QEMU_PROGW on win*. Make just one rule for building main executable, and an additional rule for win* to make console app from it. Also consolidate tests for $(QEMU_PROGW). Signed-off-by: Michael Tokarev [Fix user-mode compilation. - Paolo] Signed-off-by: Paolo Bonzini --- Makefile.target | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/Makefile.target b/Makefile.target index 6d8fde8..2726b74 100644 --- a/Makefile.target +++ b/Makefile.target @@ -16,19 +16,22 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/include ifdef CONFIG_USER_ONLY # user emulator name QEMU_PROG=qemu-$(TARGET_NAME) +QEMU_PROG_BUILD = $(QEMU_PROG) else # system emulator name +QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF) ifneq (,$(findstring -mwindows,$(libs_softmmu))) # Terminate program name with a 'w' because the linker builds a windows executable. QEMU_PROGW=qemu-system-$(TARGET_NAME)w$(EXESUF) -endif # windows executable -QEMU_PROG=qemu-system-$(TARGET_NAME)$(EXESUF) +$(QEMU_PROG): $(QEMU_PROGW) + $(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)") +QEMU_PROG_BUILD = $(QEMU_PROGW) +else +QEMU_PROG_BUILD = $(QEMU_PROG) endif - -PROGS=$(QEMU_PROG) -ifdef QEMU_PROGW -PROGS+=$(QEMU_PROGW) endif + +PROGS=$(QEMU_PROG) $(QEMU_PROGW) STPFILES= config-target.h: config-target.h-timestamp @@ -164,16 +167,9 @@ ifndef CONFIG_HAIKU LIBS+=-lm endif -ifdef QEMU_PROGW -# The linker builds a windows executable. Make also a console executable. -$(QEMU_PROGW): $(all-obj-y) ../libqemuutil.a ../libqemustub.a - $(call LINK,$^) -$(QEMU_PROG): $(QEMU_PROGW) - $(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)") -else -$(QEMU_PROG): $(all-obj-y) ../libqemuutil.a ../libqemustub.a +# build either PROG or PROGW +$(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a $(call LINK,$^) -endif gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")