billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=4dc1a2122e29e0b402707b8ace6d817df2e9e94b
commit 4dc1a2122e29e0b402707b8ace6d817df2e9e94b Author: Boris Faure <[email protected]> Date: Sun Jan 19 19:10:06 2020 +0100 themes: clean up rules to compile themes --- data/themes/default.edc | 2 +- .../{default_colors.in.edc => default/colors.edc} | 0 data/themes/meson.build | 22 ++++++++++++---------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index cd78921..8251cb4 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -4,7 +4,7 @@ color_classes { #define BG_COLOR BG_COLOR_NO_ALPHA 255 #define FG_COLOR_NO_ALPHA 170 170 170 #define FG_COLOR FG_COLOR_NO_ALPHA 255 -#include "default_colors.in.edc" +#include "default/colors.edc" } #endif #ifndef BG_COLOR_BELL_NO_ALPHA diff --git a/data/themes/default_colors.in.edc b/data/themes/default/colors.edc similarity index 100% rename from data/themes/default_colors.in.edc rename to data/themes/default/colors.edc diff --git a/data/themes/meson.build b/data/themes/meson.build index ae42af1..863c383 100644 --- a/data/themes/meson.build +++ b/data/themes/meson.build @@ -6,17 +6,19 @@ command = [edje_cc, '@INPUT@', '@OUTPUT@'] +default_deps = ['default.edc', 'default/colors.edc'] +mild_deps = ['mild.edc', 'default/colors.edc'] edje_to_compile = [ - ['default', ['default_colors.in.edc']], - ['mild', ['default_colors.in.edc']], - ['black', ['default_colors.in.edc', 'mild.edc']], - ['solarized', ['default_colors.in.edc', 'default.edc']], - ['solarized_light', ['default_colors.in.edc', 'default.edc']], - ['mustang',['default_colors.in.edc', 'mild.edc']], - ['base16_ocean_dark', ['default_colors.in.edc']], - ['smyck', ['default_colors.in.edc', 'mild.edc']], - ['nord', ['default_colors.in.edc', 'default.edc']], - ['papercolor', ['default_colors.in.edc', 'default.edc']], + ['default', default_deps], + ['mild', mild_deps], + ['black', mild_deps], + ['solarized', default_deps], + ['solarized_light', default_deps], + ['mustang', mild_deps], + ['base16_ocean_dark', mild_deps], + ['smyck', mild_deps], + ['nord', default_deps], + ['papercolor', default_deps], ] edje_install_dir = join_paths(get_option('datadir'), --
