From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Mon, 21 Apr 2014 08:11:52 +0000 (+0900)
Subject: build: fix a invalid merge
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~386^2~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efe4365604e23b9f0caee2f50066f5f06975600c;p=sdk%2Femulator%2Fqemu.git

build: fix a invalid merge

Change-Id: I505dd07f471c3f2f6a974f1e06df90997cb5a62e
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---

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)