From patchwork Fri Oct 5 16:06:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 189531 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2A18B2C032B for ; Sat, 6 Oct 2012 02:07:12 +1000 (EST) Received: from localhost ([::1]:40080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKAQd-0005rW-0n for incoming@patchwork.ozlabs.org; Fri, 05 Oct 2012 12:07:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49413) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKAQS-0005qz-TE for qemu-devel@nongnu.org; Fri, 05 Oct 2012 12:07:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TKAQN-0006ki-LV for qemu-devel@nongnu.org; Fri, 05 Oct 2012 12:06:56 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:48537) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKAQN-0006gq-3p for qemu-devel@nongnu.org; Fri, 05 Oct 2012 12:06:51 -0400 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 6 Oct 2012 02:05:19 +1000 Received: from d23relay05.au.ibm.com (202.81.31.247) by e23smtp05.au.ibm.com (202.81.31.211) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sat, 6 Oct 2012 02:05:18 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q95Fuw4Z62521548 for ; Sat, 6 Oct 2012 01:56:59 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q95G6gcP018918 for ; Sat, 6 Oct 2012 02:06:42 +1000 Received: from titi.austin.rr.com ([9.57.79.179]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q95G6dF9018860; Sat, 6 Oct 2012 02:06:41 +1000 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Fri, 5 Oct 2012 11:06:39 -0500 Message-Id: <1349453199-10717-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.5.4 x-cbid: 12100516-1396-0000-0000-000001F62147 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.81.31.147 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH] build: rm libhw X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Anthony Liguori --- Makefile | 2 +- Makefile.hw | 22 ---------------------- Makefile.objs | 2 ++ Makefile.target | 1 - configure | 5 ----- 5 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 Makefile.hw diff --git a/Makefile b/Makefile index 1cebe3a..a9c22bf 100644 --- a/Makefile +++ b/Makefile @@ -214,7 +214,7 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) -QEMULIBS=libhw libuser libdis libdis-user +QEMULIBS=libuser libdis libdis-user clean: # avoid old build problems by removing potentially incorrect old files diff --git a/Makefile.hw b/Makefile.hw deleted file mode 100644 index 86f0bf4..0000000 --- a/Makefile.hw +++ /dev/null @@ -1,22 +0,0 @@ -# Makefile for qemu target independent devices. - -include ../config-host.mak -include ../config-all-devices.mak -include $(SRC_PATH)/rules.mak - -.PHONY: all - -$(call set-vpath, $(SRC_PATH)) - -QEMU_CFLAGS+=-I.. -QEMU_CFLAGS += -I$(SRC_PATH)/include - -include $(SRC_PATH)/Makefile.objs - -all: $(hw-obj-y) -# Dummy command so that make thinks it has done something - @true - -clean: - rm -f $(addsuffix *.o, $(sort $(dir $(hw-obj-y)))) - rm -f $(addsuffix *.d, $(sort $(dir $(hw-obj-y)))) diff --git a/Makefile.objs b/Makefile.objs index b1f3e22..8c2d474 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -226,6 +226,8 @@ common-obj-y += qmp.o hmp.o universal-obj-y += $(qapi-obj-y) +common-obj-y += $(hw-obj-y) + ###################################################################### # guest agent diff --git a/Makefile.target b/Makefile.target index 4449444..3822bc5 100644 --- a/Makefile.target +++ b/Makefile.target @@ -154,7 +154,6 @@ all-obj-y += $(addprefix ../, $(universal-obj-y)) ifdef CONFIG_SOFTMMU all-obj-y += $(addprefix ../, $(common-obj-y)) all-obj-y += $(addprefix ../libdis/, $(libdis-y)) -all-obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y)) all-obj-y += $(addprefix ../, $(trace-obj-y)) else all-obj-y += $(addprefix ../libuser/, $(user-obj-y)) diff --git a/configure b/configure index e58846d..73a5f3d 100755 --- a/configure +++ b/configure @@ -3914,8 +3914,6 @@ fi if test "$target_softmmu" = "yes" ; then echo "CONFIG_SOFTMMU=y" >> $config_target_mak echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak - echo "HWDIR=../libhw" >> $config_target_mak - echo "subdir-$target: subdir-libhw" >> $config_host_mak if test "$smartcard_nss" = "yes" ; then echo "subdir-$target: subdir-libcacard" >> $config_host_mak fi @@ -4157,9 +4155,6 @@ for rom in seabios vgabios ; do echo "LD=$ld" >> $config_mak done -d=libhw -symlink "$source_path/Makefile.hw" "$d/Makefile" - d=libuser symlink "$source_path/Makefile.user" "$d/Makefile"