From patchwork Mon Aug 3 12:46:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30529 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 bilbo.ozlabs.org (Postfix) with ESMTPS id F2D7BB7079 for ; Mon, 3 Aug 2009 23:43:27 +1000 (EST) Received: from localhost ([127.0.0.1]:54225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXxox-0002Db-Lj for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 09:43:23 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwz9-0003LP-RS for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwz4-0003Hf-OS for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:51 -0400 Received: from [199.232.76.173] (port=51676 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwz4-0003HO-9P for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:46 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40800) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwz3-0006zC-Ls for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:45 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73CnjUt006536; Mon, 3 Aug 2009 08:49:45 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73CniVV026103; Mon, 3 Aug 2009 08:49:44 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8MW009715; Mon, 3 Aug 2009 08:49:43 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:19 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 28/81] Move to configure CONFIG_WIN32 libraries needed always 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 Signed-off-by: Juan Quintela --- Makefile | 4 ---- Makefile.target | 3 --- configure | 1 + 3 files changed, 1 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 88e13e6..0ea8b46 100644 --- a/Makefile +++ b/Makefile @@ -27,10 +27,6 @@ else DOCS= endif -ifdef CONFIG_WIN32 -LIBS+=-lwinmm -lws2_32 -liphlpapi -endif - build-all: $(TOOLS) $(DOCS) recurse-all config-host.mak: configure diff --git a/Makefile.target b/Makefile.target index b77c496..fdcf480 100644 --- a/Makefile.target +++ b/Makefile.target @@ -48,9 +48,6 @@ endif CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE CPPFLAGS+=-U_FORTIFY_SOURCE LIBS+=-lm -ifdef CONFIG_WIN32 -LIBS+=-lwinmm -lws2_32 -liphlpapi -endif ifdef CONFIG_SOLARIS ifdef CONFIG_NEEDS_LIBSUNMATH LIBS+=-lsunmath diff --git a/configure b/configure index 811952c..bc60dc1 100755 --- a/configure +++ b/configure @@ -355,6 +355,7 @@ if test "$mingw32" = "yes" ; then fi EXESUF=".exe" CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $CFLAGS" + LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS" fi # find source path