From 1f3ad54c056c8d51dc15c56ba363f966e4a15bed Mon Sep 17 00:00:00 2001
From: Quentin <quentin.guidee@gmail.com>
Date: Tue, 23 Jun 2020 17:35:39 +0200
Subject: [PATCH] [Change] OMEGA_THEME_* to THEME_*

---
 Makefile         | 4 ++--
 apps/Makefile    | 8 ++++----
 build/config.mak | 4 ++--
 escher/Makefile  | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 6266be7de..51cba8615 100644
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,8 @@ info:
 	@echo "EPSILON_VERSION = $(EPSILON_VERSION)"
 	@echo "EPSILON_APPS = $(EPSILON_APPS)"
 	@echo "EPSILON_I18N = $(EPSILON_I18N)"
-	@echo "OMEGA_THEME_NAME = $(OMEGA_THEME_NAME)"
-	@echo "OMEGA_THEME_REPO = $(OMEGA_THEME_REPO)"
+	@echo "THEME_NAME = $(THEME_NAME)"
+	@echo "THEME_REPO = $(THEME_REPO)"
 	@echo "BUILD_DIR = $(BUILD_DIR)"
 	@echo "PLATFORM" = $(PLATFORM)
 	@echo "DEBUG" = $(DEBUG)
diff --git a/apps/Makefile b/apps/Makefile
index 9a2f09fb0..a7345678d 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -107,12 +107,12 @@ apps_tests_src += $(addprefix apps/,\
   global_preferences.cpp \
 )
 
-ifeq ($(OMEGA_THEME_REPO),local)
+ifeq ($(THEME_REPO),local)
 $(foreach img,$(image_list), $(eval $(call rule_for, \
   ICON, \
   $(img), \
-  $(addprefix themes/themes/local/, $(addsuffix .json, $(OMEGA_THEME_NAME))), \
-  $$(PYTHON) themes/themes_manager.py -i $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \
+  $(addprefix themes/themes/local/, $(addsuffix .json, $(THEME_NAME))), \
+  $$(PYTHON) themes/themes_manager.py -i $(THEME_REPO) $(THEME_NAME) $$@ $(BUILD_DIR)/, \
   global \
 )))
 else
@@ -120,7 +120,7 @@ $(foreach img,$(image_list), $(eval $(call rule_for, \
   ICON, \
   $(img), \
   $(addsuffix /escher/palette.h, $(BUILD_DIR)), \
-  $$(PYTHON) themes/themes_manager.py -i $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \
+  $$(PYTHON) themes/themes_manager.py -i $(THEME_REPO) $(THEME_NAME) $$@ $(BUILD_DIR)/, \
   global \
 )))
 endif
diff --git a/build/config.mak b/build/config.mak
index 24b8563e9..134da4f7f 100644
--- a/build/config.mak
+++ b/build/config.mak
@@ -13,6 +13,6 @@ EPSILON_I18N ?= en fr es de pt hu
 EPSILON_GETOPT ?= 0
 EPSILON_TELEMETRY ?= 0
 ESCHER_LOG_EVENTS_BINARY ?= 0
-OMEGA_THEME_NAME ?= omega_light
-OMEGA_THEME_REPO ?= local
+THEME_NAME ?= omega_light
+THEME_REPO ?= local
 LEDS_CHOICE ?= 0
diff --git a/escher/Makefile b/escher/Makefile
index d36961b98..61bced8c3 100644
--- a/escher/Makefile
+++ b/escher/Makefile
@@ -1,11 +1,11 @@
 SFLAGS += -Iescher/include
 
-ifeq ($(OMEGA_THEME_REPO),local)
+ifeq ($(THEME_REPO),local)
 $(eval $(call rule_for, \
   THEME, \
   escher/palette.h, \
-  $(addprefix themes/themes/local/, $(addsuffix .json, $(OMEGA_THEME_NAME))), \
-  $$(PYTHON) themes/themes_manager.py $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \
+  $(addprefix themes/themes/local/, $(addsuffix .json, $(THEME_NAME))), \
+  $$(PYTHON) themes/themes_manager.py $(THEME_REPO) $(THEME_NAME) $$@ $(BUILD_DIR)/, \
   global \
 ))
 else
@@ -13,7 +13,7 @@ $(eval $(call rule_for, \
   THEME, \
   escher/palette.h, \
   themes/themes/git/.empty-folder, \
-  $$(PYTHON) themes/themes_manager.py $(OMEGA_THEME_REPO) $(OMEGA_THEME_NAME) $$@ $(BUILD_DIR)/, \
+  $$(PYTHON) themes/themes_manager.py $(THEME_REPO) $(THEME_NAME) $$@ $(BUILD_DIR)/, \
   global \
 ))
 endif