From 76cad71136b7eb371cf2a2a4e1621cfe8d9c769a Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 24 Oct 2012 11:12:21 +0200 Subject: build: kill libdis, move disassemblers to disas/ Signed-off-by: Paolo Bonzini --- Makefile.target | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Makefile.target') diff --git a/Makefile.target b/Makefile.target index 927347bac2..f353651369 100644 --- a/Makefile.target +++ b/Makefile.target @@ -70,9 +70,8 @@ obj-y = exec.o translate-all.o cpu-exec.o obj-y += tcg/tcg.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) += tci.o obj-y += fpu/softfloat.o -obj-y += disas.o -obj-$(CONFIG_TCI_DIS) += tci-dis.o obj-y += target-$(TARGET_BASE_ARCH)/ +obj-y += disas.o obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci @@ -156,11 +155,9 @@ 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 ../, $(trace-obj-y)) else all-obj-y += $(addprefix ../libuser/, $(user-obj-y)) -all-obj-y += $(addprefix ../libdis-user/, $(libdis-y)) endif #CONFIG_LINUX_USER ifdef QEMU_PROGW -- cgit v1.2.1