From 8429f0ac94f891604d2ad2e0b0f4d25860e5c09e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Boric Date: Mon, 16 Oct 2017 19:37:40 +0200 Subject: [PATCH] [apps] Include Makefile apps from list --- Makefile | 2 ++ apps/Makefile | 14 +++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 3fddcd392..ed98f3314 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,8 @@ info: @echo "CXXFLAGS = $(CXXFLAGS)" @echo "SFLAGS = $(SFLAGS)" @echo "LDFLAGS = $(LDFLAGS)" + @echo "EPSILON_APPS = $(EPSILON_APPS)" + @echo "EPSILON_I18N_LANGUAGES = $(EPSILON_I18N_LANGUAGES)" @echo "===============================" # Each sub-Makefile can either add objects to the $(objs) variable or define a diff --git a/apps/Makefile b/apps/Makefile index b4b710f87..7e5d367ab 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -1,4 +1,5 @@ EPSILON_I18N_LANGUAGES ?= en fr es de pt +EPSILON_APPS ?= calculation graph sequence settings statistics probability regression code include apps/shared/Makefile include apps/home/Makefile @@ -6,19 +7,10 @@ include apps/on_boarding/Makefile include apps/hardware_test/Makefile snapshots = -# You can select below which apps you want to include in your build, as well as -# their order on the home screen. Each Makefile below is responsible for setting +# All selected apps are included. Each Makefile below is responsible for setting # the $snapshots variable (name of the snapshot class) and the $snapshot_headers # (path to the snapshot header). -include apps/calculation/Makefile -include apps/graph/Makefile -include apps/sequence/Makefile -include apps/settings/Makefile -include apps/statistics/Makefile -include apps/probability/Makefile -include apps/regression/Makefile -include apps/code/Makefile -#include apps/picview/Makefile +$(foreach i,${EPSILON_APPS},$(eval include apps/$(i)/Makefile)) app_objs += $(addprefix apps/,\ apps_container.o\