summaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-10-24 11:12:21 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2012-12-19 08:29:06 +0100
commit76cad71136b7eb371cf2a2a4e1621cfe8d9c769a (patch)
tree88d6951ea0620e95d2bad4d458f2c51147b4218b /Makefile.objs
parentc1c9367216c97ca93de79e90822045a425d7e76d (diff)
downloadqemu-76cad71136b7eb371cf2a2a4e1621cfe8d9c769a.tar.gz
qemu-76cad71136b7eb371cf2a2a4e1621cfe8d9c769a.tar.bz2
qemu-76cad71136b7eb371cf2a2a4e1621cfe8d9c769a.zip
build: kill libdis, move disassemblers to disas/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs19
1 files changed, 3 insertions, 16 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 20fb2c54f0..3248eafe32 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -127,24 +127,10 @@ user-obj-y += $(trace-obj-y)
user-obj-y += qom/
######################################################################
-# libdis
+# disassemblers
# NOTE: the disassembler code is only needed for debugging
-libdis-y =
-libdis-$(CONFIG_ALPHA_DIS) += alpha-dis.o
-libdis-$(CONFIG_ARM_DIS) += arm-dis.o
-libdis-$(CONFIG_CRIS_DIS) += cris-dis.o
-libdis-$(CONFIG_HPPA_DIS) += hppa-dis.o
-libdis-$(CONFIG_I386_DIS) += i386-dis.o
-libdis-$(CONFIG_IA64_DIS) += ia64-dis.o
-libdis-$(CONFIG_M68K_DIS) += m68k-dis.o
-libdis-$(CONFIG_MICROBLAZE_DIS) += microblaze-dis.o
-libdis-$(CONFIG_MIPS_DIS) += mips-dis.o
-libdis-$(CONFIG_PPC_DIS) += ppc-dis.o
-libdis-$(CONFIG_S390_DIS) += s390-dis.o
-libdis-$(CONFIG_SH4_DIS) += sh4-dis.o
-libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o
-libdis-$(CONFIG_LM32_DIS) += lm32-dis.o
+universal-obj-y += disas/
######################################################################
# trace
@@ -252,5 +238,6 @@ nested-vars += \
block-obj-y \
user-obj-y \
common-obj-y \
+ universal-obj-y \
extra-obj-y
dummy := $(call unnest-vars)