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 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 13 Dec 2009 16:40:25 +0100 Message-Id: <1260718825-23158-1-git-send-email-andreas.faerber@web.de> 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 Content-Type: text/plain; charset=UTF-8 Sender: andreas.faerber@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] Quickfix for libuser.a drop List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Juan Quintela , Avi Kivity 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=C3=A4rber 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) +=3D xen_console.o xenfb.o x= en_disk.o xen_nic.o =20 user-obj-y =3D user-obj-y +=3D envlist.o path.o -user-obj-y +=3D tcg-runtime.o host-utils.o -user-obj-y +=3D cutils.o cache-utils.o +user-obj-y +=3D $(addprefix ../, tcg-runtime.o host-utils.o) +user-obj-y +=3D $(addprefix ../, cutils.o cache-utils.o) =20 ###################################################################### # 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 =20 TARGET_PATH=3D$(SRC_PATH)/target-$(TARGET_BASE_ARCH) VPATH=3D$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw --=20 1.6.5.2