diff options
| author | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-04-21 17:11:52 +0900 |
|---|---|---|
| committer | SeokYeon Hwang <syeon.hwang@samsung.com> | 2014-04-21 17:11:52 +0900 |
| commit | efe4365604e23b9f0caee2f50066f5f06975600c (patch) | |
| tree | 4e68c159fe7a71f6b3a3f2de1a6baf6da7c4b47e /Makefile.target | |
| parent | e39fc0b88fb99018819129bd3dea9395e9c73071 (diff) | |
| download | qemu-efe4365604e23b9f0caee2f50066f5f06975600c.tar.gz qemu-efe4365604e23b9f0caee2f50066f5f06975600c.tar.bz2 qemu-efe4365604e23b9f0caee2f50066f5f06975600c.zip | |
build: fix a invalid merge
Change-Id: I505dd07f471c3f2f6a974f1e06df90997cb5a62e
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.target b/Makefile.target index a0035d2750..15ea40b287 100644 --- a/Makefile.target +++ b/Makefile.target @@ -156,12 +156,6 @@ obj-y-save := $(obj-y) block-obj-y := common-obj-y := -# Makefile for TIZEN-maru -ifdef CONFIG_MARU -include $(SRC_PATH)/tizen/src/Makefile.tizen -endif -## - include $(SRC_PATH)/Makefile.objs dummy := $(call unnest-vars,.., \ block-obj-y \ @@ -172,6 +166,12 @@ dummy := $(call unnest-vars,.., \ # Now restore obj-y obj-y := $(obj-y-save) +# Makefile for TIZEN-maru +ifdef CONFIG_MARU +include $(SRC_PATH)/tizen/src/Makefile.tizen +endif +## + all-obj-y = $(obj-y) $(common-obj-y) all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) |