From 38d02663b420caa208ecbee4bfa55934ebc6eafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Tue, 18 Feb 2020 13:50:59 +0100 Subject: [PATCH] [build] epsilon_src & epsilon_official_src have to be defined because they're used by target.simulator.web.mak --- Makefile | 2 +- apps/Makefile | 2 +- build/targets.mak | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8594beee0..46acaaa5a 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ include build/struct_layout/Makefile include build/scenario/Makefile include quiz/Makefile # Quiz needs to be included at the end -all_src = $(apps_all_src) $(escher_src) $(ion_all_src) $(kandinsky_src) $(liba_src) $(libaxx_src) $(poincare_src) $(python_src) $(epsilon_src) $(runner_src) $(ion_target_device_flasher_light_src) $(ion_target_device_flasher_verbose_src) $(ion_target_device_bench_src) $(tests_src) +all_src = $(apps_all_src) $(escher_src) $(ion_all_src) $(kandinsky_src) $(liba_src) $(libaxx_src) $(poincare_src) $(python_src) $(runner_src) $(ion_target_device_flasher_light_src) $(ion_target_device_flasher_verbose_src) $(ion_target_device_bench_src) $(tests_src) all_objs = $(call object_for,$(all_src)) .SECONDARY: $(all_objs) diff --git a/apps/Makefile b/apps/Makefile index a61605344..c3af54608 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -89,7 +89,7 @@ $(BUILD_DIR)/apps/i18n.h: $(BUILD_DIR)/apps/i18n.cpp $(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png)) -all_app_src = $(app_src) $(epsilon_src) $(apps_launch_on_boarding_src) $(apps_launch_default_src) $(apps_prompt_none_src) $(apps_prompt_update_src) $(apps_prompt_beta_src) $(apps_official) $(apps_non_official) $(tests_src) +all_app_src = $(app_src)(apps_launch_on_boarding_src) $(apps_launch_default_src) $(apps_prompt_none_src) $(apps_prompt_update_src) $(apps_prompt_beta_src) $(apps_official) $(apps_non_official) $(tests_src) $(call object_for,$(all_app_src)): $(BUILD_DIR)/apps/i18n.h $(call object_for,$(all_app_src)): $(BUILD_DIR)/python/port/genhdr/qstrdefs.generated.h diff --git a/build/targets.mak b/build/targets.mak index cdc58c3e4..4f28bd056 100644 --- a/build/targets.mak +++ b/build/targets.mak @@ -1,8 +1,11 @@ # Define standard Epsilon targets base_src = $(liba_src) $(kandinsky_src) $(escher_src) $(libaxx_src) $(poincare_src) $(python_src) -$(BUILD_DIR)/epsilon.$(EXE): $(call object_for,$(base_src) $(ion_default_src) $(apps_default_src)) -$(BUILD_DIR)/epsilon.official.$(EXE): $(call object_for,$(base_src) $(ion_default_src) $(apps_official_default_src)) +epsilon_src = $(base_src) $(ion_default_src) $(apps_default_src) +epsilon_official_src = $(base_src) $(ion_default_src) $(apps_official_default_src) + +$(BUILD_DIR)/epsilon.$(EXE): $(call object_for,$(epsilon_src)) +$(BUILD_DIR)/epsilon.official.$(EXE): $(call object_for,$(epsilon_official_src)) $(BUILD_DIR)/epsilon.onboarding.$(EXE): $(call object_for, $(base_src) $(ion_default_src) $(apps_onboarding_src)) $(BUILD_DIR)/epsilon.official.onboarding.$(EXE): $(call object_for,$(base_src) $(ion_default_src) $(apps_official_onboarding_src)) $(BUILD_DIR)/epsilon.onboarding.update.$(EXE): $(call object_for, $(base_src) $(ion_default_src) $(apps_onboarding_update_src))