From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKB2P-0005q1-DO for qemu-devel@nongnu.org; Fri, 05 Oct 2012 12:46:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TKB2L-0006OP-6u for qemu-devel@nongnu.org; Fri, 05 Oct 2012 12:46:09 -0400 Received: from e23smtp03.au.ibm.com ([202.81.31.145]:60034) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TKB2K-0006OD-K2 for qemu-devel@nongnu.org; Fri, 05 Oct 2012 12:46:05 -0400 Received: from /spool/local by e23smtp03.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sat, 6 Oct 2012 02:43:47 +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 q95GaBDG23199758 for ; Sat, 6 Oct 2012 02:36:12 +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 q95Gjt5u026254 for ; Sat, 6 Oct 2012 02:45:55 +1000 From: Anthony Liguori In-Reply-To: References: <1349453199-10717-1-git-send-email-aliguori@us.ibm.com> Date: Fri, 05 Oct 2012 11:45:49 -0500 Message-ID: <87wqz46f5u.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH] build: rm libhw List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: qemu-devel@nongnu.org Blue Swirl writes: > On Fri, Oct 5, 2012 at 4:06 PM, Anthony Liguori wrote: >> 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 > > Not related to this patch, but do we need libdis-user anymore since > user and system objects can be mixed? I don't know, but the closer we can get to only building objects once the better. BTW, we could eliminate the majority of target specific objects by adding target_getpagesize() and related macros. The remaining objects that actually touch CPUState can get moved to the corresponding target-* directories. Regards, Anthony Liguori > >> >> 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" >> >> -- >> 1.7.5.4 >> >>