From 9463e0f56c5054fb8575e00388ca49ea0b4677b9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 15 May 2023 23:06:07 -0400 Subject: Only build iconcache validator if it is used --- gtk/gtkiconcachevalidator.c | 2 ++ tools/meson.build | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gtk/gtkiconcachevalidator.c b/gtk/gtkiconcachevalidator.c index 7cec4d486f..8ddd24a361 100644 --- a/gtk/gtkiconcachevalidator.c +++ b/gtk/gtkiconcachevalidator.c @@ -20,6 +20,7 @@ #include #include +#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 0e90d88945..af77a7abb6 100644 --- 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, ) -- cgit v1.2.1