From patchwork Mon Aug 3 12:46:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30527 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 2494BB708B for ; Mon, 3 Aug 2009 23:39:34 +1000 (EST) Received: from localhost ([127.0.0.1]:33467 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXxlC-0006dj-SP for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 09:39:30 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwz7-0003Jm-8B for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwz2-0003Fq-Fx for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:48 -0400 Received: from [199.232.76.173] (port=51674 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwz1-0003FX-WC for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:44 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40796) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwz1-0006ya-8f for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:49:43 -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 n73CngYZ006523; Mon, 3 Aug 2009 08:49:42 -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 n73CnfY0026097; Mon, 3 Aug 2009 08:49:41 -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 n73Cn8MU009715; Mon, 3 Aug 2009 08:49:40 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:17 +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 26/81] CLOCKLIBS was used for all binaries 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 | 2 -- Makefile.target | 2 -- configure | 5 ++--- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 62f753b..1362b53 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,6 @@ else DOCS= endif -LIBS+=$(CLOCKLIBS) - ifdef CONFIG_SOLARIS LIBS+=-lsocket -lnsl -lresolv endif diff --git a/Makefile.target b/Makefile.target index 9c7cabe..5d05e71 100644 --- a/Makefile.target +++ b/Makefile.target @@ -202,8 +202,6 @@ signal.o: CFLAGS += $(HELPER_CFLAGS) ARLIBS=../libqemu_user.a libqemu.a endif #CONFIG_LINUX_USER -LIBS+= $(CLOCKLIBS) - ######################################################### # Darwin user emulator target diff --git a/configure b/configure index 94a5697..1d05169 100755 --- a/configure +++ b/configure @@ -1340,9 +1340,9 @@ int main(void) { clockid_t id; return clock_gettime(id, NULL); } EOF if compile_prog "" "" ; then - CLOCKLIBS="" + : elif compile_prog "" "-lrt" ; then - CLOCKLIBS="-lrt" + LIBS="-lrt $LIBS" fi # Determine what linker flags to use to force archive inclusion @@ -1749,7 +1749,6 @@ echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak echo "ARLIBS_END=$arlibs_end" >> $config_host_mak echo "LIBS=$LIBS" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak -echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak echo "/* Automatically generated by configure - do not modify */" > $config_host_h