From patchwork Sat Apr 27 11:48:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 240106 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 818EA2C00A2 for ; Sat, 27 Apr 2013 21:49:52 +1000 (EST) Received: from localhost ([::1]:48153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UW3dW-0007vC-Rc for incoming@patchwork.ozlabs.org; Sat, 27 Apr 2013 07:49:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UW3d1-0007sH-JD for qemu-devel@nongnu.org; Sat, 27 Apr 2013 07:49:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UW3d0-0007bF-Ia for qemu-devel@nongnu.org; Sat, 27 Apr 2013 07:49:19 -0400 Received: from mail-bk0-x235.google.com ([2a00:1450:4008:c01::235]:45402) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UW3d0-0007ZX-6b for qemu-devel@nongnu.org; Sat, 27 Apr 2013 07:49:18 -0400 Received: by mail-bk0-f53.google.com with SMTP id jg9so2068589bkc.26 for ; Sat, 27 Apr 2013 04:49:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=nhedvoGlj69sSxPIcBJzpRUDXaG72a1YPASv2sqjRWo=; b=zI7H+ilsLNPbUhJzTbCyzBxS8RquGf5JS1Ibi5OTNBg7HFj+Nl+XIqbiQkQNNowOCk GQeO5eA50Mi2bkWEddFGsKl9sae9bqNHAwKTPd5bEADoYSTASiZFHNdx6UB2yd8ysS89 QAZ1Rj4u0H4E/Jodfqm5eiTCgPFUUxmU33Icdr90OaLetE8O262wBMR3iL5hqZVAYV5W 3yRaKFASUke97+l6AghI/x/lSStY0rJW/tZn2fQyzQBQ+II6Mnm4CrhP3IyLUcVat3iF V8QWjV0upiXwW7wQ4pr+sfTZurvRoL4WwRl0Tb9Ik9IhEHDXMaCLq4B8I/p/eI0aIYtV 2Ihg== X-Received: by 10.204.167.73 with SMTP id p9mr19330523bky.99.1367063357221; Sat, 27 Apr 2013 04:49:17 -0700 (PDT) Received: from yakj.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPSA id tl1sm4368203bkb.7.2013.04.27.04.49.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 27 Apr 2013 04:49:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 27 Apr 2013 13:48:38 +0200 Message-Id: <1367063321-19196-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1367063321-19196-1-git-send-email-pbonzini@redhat.com> References: <1367063321-19196-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:4008:c01::235 Cc: blauwirbel@gmail.com, sw@weilnetz.de Subject: [Qemu-devel] [PATCH 2/5] win32: move Makefile dependencies on version-obj-y to rules.mak 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 This makes the test on $(LIBTOOL) work. Otherwise, LIBTOOL is /bin/false by the time the test is done. Fixes Win32 compilation without a working cross-libtool. Signed-off-by: Paolo Bonzini --- Makefile | 3 +-- rules.mak | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 58e3527..f91f3b0 100644 --- a/Makefile +++ b/Makefile @@ -170,8 +170,7 @@ version.o: $(SRC_PATH)/version.rc config-host.h | version.lo version.lo: $(SRC_PATH)/version.rc config-host.h version-obj-$(CONFIG_WIN32) += version.o -version-lobj-$(CONFIG_WIN32) += $(if $(LIBTOOL),version.lo) -Makefile: $(version-obj-y) $(version-lobj-y) +version-lobj-$(CONFIG_WIN32) += version.lo ###################################################################### diff --git a/rules.mak b/rules.mak index 279525d..197a9d7 100644 --- a/rules.mak +++ b/rules.mak @@ -22,12 +22,15 @@ QEMU_CFLAGS += -I$(