diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-04-21 15:32:27 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-04-21 15:57:17 +0900 |
| commit | c38a355e67e966e447e3b58b897daffda70e2801 (patch) | |
| tree | 3a90ebbaf8bf89014212325e374e5073f074b014 /Makefile.target | |
| parent | 3d8e749baf4b053639581bc11e5664dc182e621d (diff) | |
| parent | a9e8aeb3755bccb7b51174adcf4a3fc427e0d147 (diff) | |
| download | qemu-c38a355e67e966e447e3b58b897daffda70e2801.tar.gz qemu-c38a355e67e966e447e3b58b897daffda70e2801.tar.bz2 qemu-c38a355e67e966e447e3b58b897daffda70e2801.zip | |
Merge branch 'upstream_qemu_2.0' into tizen
Initial merge
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
.gitignore
Makefile.target
block/raw-win32.c
configure
cpu-exec.c
cpus.c
hw/9pfs/virtio-9p-device.c
hw/i386/pc_piix.c
include/exec/cpu-defs.h
include/qemu-common.h
include/sysemu/sysemu.h
include/ui/console.h
tcg/i386/tcg-target.c
tcg/tcg.h
ui/console.c
ui/input.c
util/oslib-posix.c
vl.c
Change-Id: I52df9052942eea8d541bde75fd936e58a9f2f8ff
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/Makefile.target b/Makefile.target index 295c59ab1d..a0035d2750 100644 --- a/Makefile.target +++ b/Makefile.target @@ -140,8 +140,6 @@ else obj-y += hw/$(TARGET_BASE_ARCH)/ endif -main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) - GENERATED_HEADERS += hmp-commands.h qmp-commands-old.h endif # CONFIG_SOFTMMU @@ -149,7 +147,14 @@ endif # CONFIG_SOFTMMU # Workaround for http://gcc.gnu.org/PR55489, see configure. %/translate.o: QEMU_CFLAGS += $(TRANSLATE_OPT_CFLAGS) -nested-vars += obj-y +dummy := $(call unnest-vars,,obj-y) + +# we are making another call to unnest-vars with different vars, protect obj-y, +# it can be overriden in subdir Makefile.objs +obj-y-save := $(obj-y) + +block-obj-y := +common-obj-y := # Makefile for TIZEN-maru ifdef CONFIG_MARU @@ -157,11 +162,18 @@ include $(SRC_PATH)/tizen/src/Makefile.tizen endif ## -# This resolves all nested paths, so it must come last include $(SRC_PATH)/Makefile.objs +dummy := $(call unnest-vars,.., \ + block-obj-y \ + block-obj-m \ + common-obj-y \ + common-obj-m) + +# Now restore obj-y +obj-y := $(obj-y-save) -all-obj-y = $(obj-y) -all-obj-y += $(addprefix ../, $(common-obj-y)) +all-obj-y = $(obj-y) $(common-obj-y) +all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) ifndef CONFIG_HAIKU LIBS+=-lm |