From 6e3ce5d29502f6c2459627d14e2c442241bf5bb4 Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Wed, 6 Mar 2019 13:57:01 +0100 Subject: [PATCH] [scripts] Make sure to build i18n.h --- Makefile | 2 -- apps/Makefile | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 896c66470..7bf60b37a 100644 --- a/Makefile +++ b/Makefile @@ -88,8 +88,6 @@ $$(BUILD_DIR)/$(1).$$(EXE): $$(objs) $(1).$$(EXE): $$(BUILD_DIR)/$(1).$$(EXE) endef -$(BUILD_DIR)/epsilon.$(EXE): $(call object_for,$(app_src)) - $(foreach executable,$(executables),$(eval $(call rules_for_executable,$(executable)))) # Define standard compilation rules diff --git a/apps/Makefile b/apps/Makefile index 451c0e075..d3cb9321f 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -40,8 +40,6 @@ epsilon_app_names = '$(foreach i,${EPSILON_APPS},"$(i)", )' $(call object_for,apps/apps_container_storage.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names) - - # I18n file generation # The header is refered to as so make sure it's findable this way @@ -76,8 +74,6 @@ $(eval $(call rule_for, \ $(BUILD_DIR)/apps/i18n.h: $(BUILD_DIR)/apps/i18n.cpp -$(call object_for,$(app_src)): $(BUILD_DIR)/apps/i18n.h - # Handle PNG files $(eval $(call depends_on_image,apps/title_bar_view.cpp,apps/exam_icon.png)) @@ -93,6 +89,8 @@ epsilon_src += $(addprefix apps/, \ i18n.py \ ) +$(call object_for,$(app_src) $(epsilon_src)): $(BUILD_DIR)/apps/i18n.h + $(BUILD_DIR)/epsilon.$(EXE): $(call object_for,$(epsilon_src)) src += $(app_src)