Only build iconcache validator if it is used

diff --git a/gtk/gtkiconcachevalidator.c b/gtk/gtkiconcachevalidator.c
index 7cec4d486fe7ca15c66264cefa23419bbdcd00ec..8ddd24a361ff83e3c4ae2b34cf7084c8ad679d8b 100644 (file)
--- a/gtk/gtkiconcachevalidator.c
+++ b/gtk/gtkiconcachevalidator.c
@@ -20,6 +20,7 @@
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 
+#if defined(G_ENABLE_DEBUG) || defined(BUILD_TOOLS)
 
 #define VERBOSE(x)
 
@@ -401,3 +402,4 @@ gtk_icon_cache_validate (CacheInfo *info)
   return TRUE;
 }
 
+#endif

diff --git a/tools/meson.build b/tools/meson.build
index 0e90d889458405310c565ca1eda92254c209de58..af77a7abb63f69e98d91210b2a2b710b66a47533 100644 (file)
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -31,7 +31,7 @@ gtk_tools = [
                          'gtk-builder-tool-screenshot.c',
                          'gtk-builder-tool-preview.c',
                          'fake-scope.c'], [libgtk_dep] ],
-  ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+  ['gtk4-update-icon-cache', ['updateiconcache.c', '../gtk/gtkiconcachevalidator.c' ] + extra_update_icon_cache_objs, [ libgtk_dep ] ],
   ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
 ]
 
@@ -47,7 +47,7 @@ foreach tool: gtk_tools
   exe = executable(tool_name,
     sources: tool_srcs,
     include_directories: [confinc],
-    c_args: common_cflags,
+    c_args: common_cflags + [ '-DBUILD_TOOLS' ],
     dependencies: tool_deps,
     install: true,
   )