From patchwork Sun Dec 13 15:40:25 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 41039 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 AC8D0B6EF7 for ; Mon, 14 Dec 2009 02:42:34 +1100 (EST) Received: from localhost ([127.0.0.1]:55238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJqad-0004bh-PT for incoming@patchwork.ozlabs.org; Sun, 13 Dec 2009 10:42:31 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NJqZJ-0004B0-Pp for qemu-devel@nongnu.org; Sun, 13 Dec 2009 10:41:09 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NJqZE-000488-KV for qemu-devel@nongnu.org; Sun, 13 Dec 2009 10:41:09 -0500 Received: from [199.232.76.173] (port=57198 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NJqZE-000485-Cd for qemu-devel@nongnu.org; Sun, 13 Dec 2009 10:41:04 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:40817) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NJqZD-0005Jn-LE for qemu-devel@nongnu.org; Sun, 13 Dec 2009 10:41:04 -0500 Received: from smtp08.web.de (fmsmtp08.dlan.cinetic.de [172.20.5.216]) by fmmailgate01.web.de (Postfix) with ESMTP id 5867914153CEF; Sun, 13 Dec 2009 16:40:29 +0100 (CET) Received: from [84.148.120.91] (helo=localhost.localdomain) by smtp08.web.de with asmtp (WEB.DE 4.110 #314) id 1NJqYe-000880-00; Sun, 13 Dec 2009 16:40:28 +0100 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 13 Dec 2009 16:40:25 +0100 Message-Id: <1260718825-23158-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1260691332-6333-1-git-send-email-andreas.faerber@web.de> References: <1260691332-6333-1-git-send-email-andreas.faerber@web.de> MIME-Version: 1.0 X-Sender: Andreas.Faerber@web.de X-Provags-ID: V01U2FsdGVkX1/jSwfjXeV90fUdWYxGpzpWSfeLljcQpza1VwLR Ti236ubkVBHtjFM4T/uGHjPWYAQ7in2S2DjRx8AfgzOxYcnFl7 LaYMcUEhTUMCvo1k1mIw== X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Juan Quintela , Avi Kivity Subject: [Qemu-devel] [PATCH] Quickfix for libuser.a drop 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 User emulators did not seem to have a $(HWLIB) directory, so don't try to include config.mak from there in Makefile.target. libuser.a included some objects of libqemu_common.a, so fix the paths to the shared files, to avoid file not found errors while linking. Signed-off-by: Andreas Färber Cc: Juan Quintela Cc: Avi Kivity --- Makefile.objs | 4 ++-- Makefile.target | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index fd69717..045d338 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -119,8 +119,8 @@ common-obj-$(CONFIG_XEN) += xen_console.o xenfb.o xen_disk.o xen_nic.o user-obj-y = user-obj-y += envlist.o path.o -user-obj-y += tcg-runtime.o host-utils.o -user-obj-y += cutils.o cache-utils.o +user-obj-y += $(addprefix ../, tcg-runtime.o host-utils.o) +user-obj-y += $(addprefix ../, cutils.o cache-utils.o) ###################################################################### # libhw diff --git a/Makefile.target b/Makefile.target index 22a2f1e..d4bb4d6 100644 --- a/Makefile.target +++ b/Makefile.target @@ -7,7 +7,9 @@ include ../config-host.mak include config-devices.mak include config-target.mak include $(SRC_PATH)/rules.mak +ifneq ($(HWDIR),) include $(HWDIR)/config.mak +endif TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw