Blue Swirl <blauwir...@gmail.com> writes: > On Fri, Oct 5, 2012 at 4:06 PM, Anthony Liguori <aligu...@us.ibm.com> wrote: >> Signed-off-by: Anthony Liguori <aligu...@us.ibm.com> >> --- >> 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 >> >>
