From e6fefd42bd83423f19eb970b4aea353bf571630c Mon Sep 17 00:00:00 2001
From: Robert Sipka <rsipka.uszeged@partner.samsung.com>
Date: Thu, 28 Jul 2016 14:15:11 +0200
Subject: [PATCH] Build fix for RIOT target after the modifications of the
 build system (commit ddab1d8).

JerryScript-DCO-1.0-Signed-off-by: Robert Sipka rsipka.uszeged@partner.samsung.com
---
 targets/riot-stm32f4/Makefile.riot | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/targets/riot-stm32f4/Makefile.riot b/targets/riot-stm32f4/Makefile.riot
index 170197f5b..29d4e352c 100644
--- a/targets/riot-stm32f4/Makefile.riot
+++ b/targets/riot-stm32f4/Makefile.riot
@@ -13,10 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TYPE       ?= release
-INTERM     ?= build/obj-riot-stm32f4
-OUTPUT     ?= build/bin/$(TYPE).riotstm32f4
-COPYTARGET ?= targets/riot-stm32f4/bin/
+BUILD_DIR  ?= build/riotstm32f4
+COPYTARGET ?= targets/riot-stm32f4/bin
 
 JERRYHEAP  ?= 16
 
@@ -29,24 +27,24 @@ EXT_CFLAGS += -Wno-error=format=
 all: libjerry riot-jerry
 
 libjerry:
-	mkdir -p $(INTERM)
-	mkdir -p $(OUTPUT)
+	mkdir -p $(BUILD_DIR)
 	mkdir -p $(COPYTARGET)
-	cmake -B$(INTERM) -H./ \
-	 -DEXTERNAL_PORT_DIR=UNDEFINED \
+	cmake -B$(BUILD_DIR) -H./ \
 	 -DENABLE_LTO=OFF \
-	 -DENABLE_VALGRIND=OFF \
-	 -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
+	 -DFEATURE_VALGRIND=OFF \
+	 -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain_external.cmake \
+	 -DJERRY_LIBC=OFF \
+	 -DJERRY_CMDLINE=OFF \
 	 -DCOMPILER_DEFAULT_LIBC=ON \
+	 -DENABLE_ALL_IN_ONE=OFF \
 	 -DEXTERNAL_CMAKE_SYSTEM_PROCESSOR=armv7l-hf \
 	 -DEXTERNAL_CMAKE_C_COMPILER=arm-none-eabi-gcc \
 	 -DEXTERNAL_CMAKE_C_COMPILER_ID=GNU \
 	 -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
-	 -DEXTERNAL_MEM_HEAP_SIZE_KB=$(JERRYHEAP)
+	 -DMEM_HEAP_SIZE_KB=$(JERRYHEAP)
 
-	make -C $(INTERM) $(TYPE).external
-	cp `cat $(INTERM)/$(TYPE).external/list` $(OUTPUT)/.
-	cp $(OUTPUT)/lib$(TYPE).jerry-core.a $(COPYTARGET)/libjerrycore.a
+	make -C$(BUILD_DIR) jerry-core
+	cp $(BUILD_DIR)/lib/libjerry-core.a $(COPYTARGET)/libjerrycore.a
 
 riot-jerry: libjerry
 	make -f ./targets/riot-stm32f4/Makefile
@@ -55,7 +53,6 @@ flash: libjerry
 	make -f ./targets/riot-stm32f4/Makefile flash
 
 clean:
-	rm -rf $(INTERM)
 	rm -rf $(OUTPUT)
 	rm -rf $(COPYTARGET)
 	make -f ./targets/riot-stm32f4/Makefile clean