From a8a59123197d0b3bbaf475a66b4023b872618234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Fri, 12 Jul 2019 10:41:21 +0200
Subject: [PATCH] [scripts] Enable to call "makefile PLATFORM=emscripten
 simulator.zip" without precising the building directory

---
 Makefile                       | 4 +++-
 scripts/targets.device.mak     | 4 +---
 scripts/targets.emscripten.mak | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 557ccc9dd..e3bcff81a 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,8 @@ all_objs = $(call object_for,$(all_src))
 
 executables = epsilon epsilon.on-boarding epsilon.on-boarding.update epsilon.on-boarding.beta test
 
+extensions = $(EXE)
+
 #define platform generic targets
 all_epsilon_common_src = $(ion_src) $(liba_src) $(kandinsky_src) $(epsilon_src) $(app_src) $(escher_src) $(libaxx_src) $(poincare_src) $(python_src) $(ion_device_dfu_relocated_src)
 all_epsilon_default_src = $(all_epsilon_common_src) $(apps_launch_default_src) $(apps_prompt_none_src)
@@ -97,7 +99,7 @@ $(BUILD_DIR)/test.$(EXE): $(BUILD_DIR)/quiz/src/tests_symbols.o $(call object_fo
 # We include them before the standard ones to give them precedence.
 -include scripts/targets.$(PLATFORM).mak
 
-$(foreach executable,$(executables),$(eval $(call rules_for_targets,$(executable),$(EXE))))
+$(foreach extension,$(extensions),$(foreach executable,$(executables),$(eval $(call rules_for_targets,$(executable),$(extension)))))
 
 # Define standard compilation rules
 
diff --git a/scripts/targets.device.mak b/scripts/targets.device.mak
index 1868251cf..8c3446c94 100644
--- a/scripts/targets.device.mak
+++ b/scripts/targets.device.mak
@@ -1,9 +1,7 @@
 include scripts/targets.device.$(MODEL).mak
 
 executables += flasher.light flasher.verbose bench.ram bench.flash
-extensions = dfu hex bin
-
-$(foreach extension,$(extensions),$(foreach executable,$(executables),$(eval $(call rules_for_targets,$(executable),$(extension)))))
+extensions += dfu hex bin
 
 $(BUILD_DIR)/%.dfu: $(BUILD_DIR)/%.$(EXE)
 	@echo "DFUSE   $@"
diff --git a/scripts/targets.emscripten.mak b/scripts/targets.emscripten.mak
index f8b9e7bcd..bed44f606 100644
--- a/scripts/targets.emscripten.mak
+++ b/scripts/targets.emscripten.mak
@@ -1,3 +1,6 @@
+executables += epsilon.packed simulator
+extensions += zip
+
 $(BUILD_DIR)/epsilon.packed.js: LDFLAGS += --memory-init-file 0
 $(BUILD_DIR)/epsilon.packed.js: $(call object_for,$(all_epsilon_default_src))