From 3399b366797983a47216059e801b815fff9af3c6 Mon Sep 17 00:00:00 2001
From: Hermet Park <hermet@lottiefiles.com>
Date: Fri, 19 Apr 2024 10:12:31 +0900
Subject: [PATCH] infra: meson code clean up

---
 meson.build           | 27 +++++++++++++--------------
 src/tools/meson.build |  6 +++---
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/meson.build b/meson.build
index 199007f4..16a55a29 100644
--- a/meson.build
+++ b/meson.build
@@ -31,27 +31,26 @@ if get_option('engines').contains('wg_beta') == true
     config_h.set10('THORVG_WG_RASTER_SUPPORT', true)
 endif
 
+#Tools
+all_tools = get_option('tools').contains('all')
+svg2tvg = all_tools or get_option('tools').contains('svg2tvg')
+lottie2gif = all_tools or get_option('tools').contains('lottie2gif')
+svg2png = all_tools or get_option('tools').contains('svg2png')
+
 #Loaders
 all_loaders = get_option('loaders').contains('all')
-svg_loader = all_loaders or get_option('loaders').contains('svg')
+svg_loader = all_loaders or get_option('loaders').contains('svg') or svg2tvg or svg2png
 tvg_loader = all_loaders or get_option('loaders').contains('tvg')
 png_loader = all_loaders or get_option('loaders').contains('png')
 jpg_loader = all_loaders or get_option('loaders').contains('jpg')
-lottie_loader = all_loaders or get_option('loaders').contains('lottie')
+lottie_loader = all_loaders or get_option('loaders').contains('lottie') or lottie2gif
 ttf_loader = all_loaders or get_option('loaders').contains('ttf')
 webp_loader = all_loaders or get_option('loaders').contains('webp')
 
 #Savers
 all_savers = get_option('savers').contains('all')
-tvg_saver = all_savers or get_option('savers').contains('tvg')
-gif_saver = all_savers or get_option('savers').contains('gif')
-
-#Tools
-all_tools = get_option('tools').contains('all')
-svg_loader = svg_loader or all_tools or get_option('tools').contains('svg')
-lottie_loader = lottie_loader or all_tools or get_option('tools').contains('lottie')
-tvg_saver = tvg_saver or all_tools or get_option('tools').contains('tvg')
-gif_saver = gif_saver or all_tools or get_option('tools').contains('gif')
+tvg_saver = all_savers or get_option('savers').contains('tvg') or svg2tvg
+gif_saver = all_savers or get_option('savers').contains('gif') or lottie2gif
 
 #Loaders/savers/tools config
 if svg_loader
@@ -191,9 +190,9 @@ Summary:
         get_option('log'),
         get_option('tests'),
         get_option('examples'),
-        all_tools or get_option('tools').contains('svg2tvg'),
-        all_tools or get_option('tools').contains('svg2png'),
-        all_tools or get_option('tools').contains('lottie2gif'),
+        svg2tvg,
+        svg2png,
+        lottie2gif
     )
 
 message(summary)
diff --git a/src/tools/meson.build b/src/tools/meson.build
index 276992de..9ed8a7c5 100644
--- a/src/tools/meson.build
+++ b/src/tools/meson.build
@@ -2,14 +2,14 @@ if (lib_type == 'static')
     compiler_flags += ['-DTVG_STATIC']
 endif
 
-if all_tools or get_option('tools').contains('svg2png') == true
+if svg2png
    subdir('svg2png')
 endif
 
-if all_tools or get_option('tools').contains('svg2tvg') == true
+if svg2tvg
    subdir('svg2tvg')
 endif
 
-if all_tools or get_option('tools').contains('lottie2gif') == true
+if lottie2gif
    subdir('lottie2gif')
 endif
\ No newline at end of file