From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsgE9-0008Rk-GH for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsgE8-00057c-1E for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:53 -0500 Received: from cantor2.suse.de ([195.135.220.15]:45622 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsgE7-00057V-Qv for qemu-devel@nongnu.org; Tue, 08 Jan 2013 15:56:51 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 8 Jan 2013 21:56:21 +0100 Message-Id: <1357678594-427-5-git-send-email-afaerber@suse.de> In-Reply-To: <1357678594-427-1-git-send-email-afaerber@suse.de> References: <1357678594-427-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 04/17] qdev: Include qdev code into *-user, too List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost The code depends on some functions from qemu-option.o, so add qemu-option.o to universal-obj-y to make sure it's included. Signed-off-by: Eduardo Habkost Signed-off-by: Andreas F=C3=A4rber --- Makefile.objs | 8 ++++++++ hw/Makefile.objs | 9 +++++++-- 2 Dateien ge=C3=A4ndert, 15 Zeilen hinzugef=C3=BCgt(+), 2 Zeilen entfern= t(-) diff --git a/Makefile.objs b/Makefile.objs index a3eab4b..12a314e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -22,6 +22,13 @@ qom-obj-y =3D qom/ universal-obj-y +=3D $(qom-obj-y) =20 ####################################################################### +# Core hw code (qdev core) +hw-core-obj-y +=3D hw/ +hw-core-obj-y +=3D qemu-option.o + +universal-obj-y +=3D $(hw-core-obj-y) + +####################################################################### # oslib-obj-y is code depending on the OS (win32 vs posix) oslib-obj-y =3D osdep.o cutils.o qemu-timer-common.o oslib-obj-$(CONFIG_WIN32) +=3D oslib-win32.o qemu-thread-win32.o @@ -182,6 +189,7 @@ nested-vars +=3D \ user-obj-y \ common-obj-y \ universal-obj-y \ + hw-core-obj-y \ extra-obj-y \ trace-obj-y dummy :=3D $(call unnest-vars) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index b8bbed3..6b8a68c 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,3 +1,9 @@ +# core qdev-related obj files, also used by *-user: +hw-core-obj-y +=3D qdev.o qdev-properties.o +# irq.o needed for qdev GPIO handling: +hw-core-obj-y +=3D irq.o + + common-obj-y =3D usb/ ide/ pci/ common-obj-y +=3D loader.o common-obj-$(CONFIG_VIRTIO) +=3D virtio-console.o @@ -154,7 +160,6 @@ common-obj-$(CONFIG_SOUND) +=3D $(sound-obj-y) common-obj-$(CONFIG_REALLY_VIRTFS) +=3D 9pfs/ =20 common-obj-y +=3D usb/ -common-obj-y +=3D irq.o common-obj-$(CONFIG_PTIMER) +=3D ptimer.o common-obj-$(CONFIG_MAX7310) +=3D max7310.o common-obj-$(CONFIG_WM8750) +=3D wm8750.o @@ -180,7 +185,7 @@ common-obj-$(CONFIG_SD) +=3D sd.o common-obj-y +=3D bt.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o common-obj-y +=3D bt-hci-csr.o common-obj-y +=3D msmouse.o ps2.o -common-obj-y +=3D qdev.o qdev-properties.o qdev-monitor.o +common-obj-y +=3D qdev-monitor.o common-obj-y +=3D qdev-properties-system.o common-obj-$(CONFIG_BRLAPI) +=3D baum.o =20 --=20 1.7.10.4