diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-19 17:15:39 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-19 17:15:39 -0600 |
| commit | 27dd7730582be85c7d4f680f5f71146629809c86 (patch) | |
| tree | 3a36db2e407711ed222de28b839744db48a75059 /Makefile.target | |
| parent | 914606d26e654d4c01bd5186f4d05e3fd445e219 (diff) | |
| parent | ec5e016c9a68588bd01be387416923c7dcafb951 (diff) | |
Merge remote-tracking branch 'bonzini/header-dirs' into staging
* bonzini/header-dirs: (45 commits)
janitor: move remaining public headers to include/
hw: move executable format header files to hw/
fpu: move public header file to include/fpu
softmmu: move remaining include files to include/ subdirectories
softmmu: move include files to include/sysemu/
misc: move include files to include/qemu/
qom: move include files to include/qom/
migration: move include files to include/migration/
monitor: move include files to include/monitor/
exec: move include files to include/exec/
block: move include files to include/block/
qapi: move include files to include/qobject/
janitor: add guards to headers
qapi: make struct Visitor opaque
qapi: remove qapi/qapi-types-core.h
qapi: move inclusions of qemu-common.h from headers to .c files
ui: move files to ui/ and include/ui/
qemu-ga: move qemu-ga files to qga/
net: reorganize headers
net: move net.c to net/
...
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.target b/Makefile.target index 927347bac2..8bbad380c2 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,8 @@ 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)) +all-obj-y += $(addprefix ../, $(user-obj-y)) endif #CONFIG_LINUX_USER ifdef QEMU_PROGW |