build: Redo the tools build

Move the tools directory to be toplevel, and instead of
recompiling sources twice, link them with the our new
static libgtk.a.

18 files changed, 10 insertions, 9 deletions

diff --git a/gtk/tools/gdkpixbufutils.c b/gtk/gdkpixbufutils.c
index 66a4cc46de..66a4cc46de 100644
--- a/gtk/tools/gdkpixbufutils.c
+++ b/gtk/gdkpixbufutils.c
diff --git a/gtk/tools/gtkiconcachevalidator.c b/gtk/gtkiconcachevalidator.c
index 7cec4d486f..7cec4d486f 100644
--- a/gtk/tools/gtkiconcachevalidator.c
+++ b/gtk/gtkiconcachevalidator.c
diff --git a/gtk/meson.build b/gtk/meson.build
index ad9e8be72d..74a0495189 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -15,7 +15,7 @@ gtk_cargs = [
 # introspected
 gtk_private_sources = files([
   'fnmatch.c',
-  'tools/gdkpixbufutils.c',
+  'gdkpixbufutils.c',
   'gsettings-mapping.c',
   'gtkaccessibleattributeset.c',
   'gtkaccessiblevalue.c',
@@ -113,7 +113,7 @@ gtk_private_sources = files([
   'gtkgladecatalog.c',
   'gtkhsla.c',
   'gtkiconcache.c',
-  'tools/gtkiconcachevalidator.c',
+  'gtkiconcachevalidator.c',
   'gtkiconhelper.c',
   'gtkkineticscrolling.c',
   'gtkmagnifier.c',
@@ -1277,5 +1277,3 @@ libgtk_static_dep = declare_dependency(sources: gtk_dep_sources,
   link_with: [libgtk_static, libgtk_css, libgdk, libgsk ],
   link_args: common_ldflags,
 )
-
-subdir('tools')
diff --git a/meson.build b/meson.build
index d899561a33..3c24e16835 100644
--- a/meson.build
+++ b/meson.build
@@ -689,6 +689,7 @@ subdir('gtk/css')
 subdir('gdk')
 subdir('gsk')
 subdir('gtk')
+subdir('tools')
 subdir('modules')
 if get_option('demos')
   subdir('demos')
diff --git a/gtk/tools/encodesymbolic.c b/tools/encodesymbolic.c
index 6f4a44f573..6f4a44f573 100644
--- a/gtk/tools/encodesymbolic.c
+++ b/tools/encodesymbolic.c
diff --git a/gtk/tools/gtk-builder-tool-enumerate.c b/tools/gtk-builder-tool-enumerate.c
index feb3758cc5..feb3758cc5 100644
--- a/gtk/tools/gtk-builder-tool-enumerate.c
+++ b/tools/gtk-builder-tool-enumerate.c
diff --git a/gtk/tools/gtk-builder-tool-preview.c b/tools/gtk-builder-tool-preview.c
index db345c7bca..db345c7bca 100644
--- a/gtk/tools/gtk-builder-tool-preview.c
+++ b/tools/gtk-builder-tool-preview.c
diff --git a/gtk/tools/gtk-builder-tool-simplify.c b/tools/gtk-builder-tool-simplify.c
index 990377bd21..990377bd21 100644
--- a/gtk/tools/gtk-builder-tool-simplify.c
+++ b/tools/gtk-builder-tool-simplify.c
diff --git a/gtk/tools/gtk-builder-tool-validate.c b/tools/gtk-builder-tool-validate.c
index 8551231730..8551231730 100644
--- a/gtk/tools/gtk-builder-tool-validate.c
+++ b/tools/gtk-builder-tool-validate.c
diff --git a/gtk/tools/gtk-builder-tool.c b/tools/gtk-builder-tool.c
index bc89207049..bc89207049 100644
--- a/gtk/tools/gtk-builder-tool.c
+++ b/tools/gtk-builder-tool.c
diff --git a/gtk/tools/gtk-builder-tool.h b/tools/gtk-builder-tool.h
index 3d895d83bb..3d895d83bb 100644
--- a/gtk/tools/gtk-builder-tool.h
+++ b/tools/gtk-builder-tool.h
diff --git a/gtk/tools/gtk-launch.c b/tools/gtk-launch.c
index 9305095ea2..9305095ea2 100644
--- a/gtk/tools/gtk-launch.c
+++ b/tools/gtk-launch.c
diff --git a/gtk/tools/gtk-query-settings.c b/tools/gtk-query-settings.c
index fbaaa337a6..fbaaa337a6 100644
--- a/gtk/tools/gtk-query-settings.c
+++ b/tools/gtk-query-settings.c
diff --git a/gtk/tools/gtk4builder.its b/tools/gtk4builder.its
index 689ef0d216..689ef0d216 100644
--- a/gtk/tools/gtk4builder.its
+++ b/tools/gtk4builder.its
diff --git a/gtk/tools/gtk4builder.loc b/tools/gtk4builder.loc
index 5d77e4841c..5d77e4841c 100644
--- a/gtk/tools/gtk4builder.loc
+++ b/tools/gtk4builder.loc
diff --git a/gtk/tools/gtk4builder.rng b/tools/gtk4builder.rng
index 125051511c..125051511c 100644
--- a/gtk/tools/gtk4builder.rng
+++ b/tools/gtk4builder.rng
diff --git a/gtk/tools/meson.build b/tools/meson.build
index 8f7a62db17..e93f97d32a 100644
--- a/gtk/tools/meson.build
+++ b/tools/meson.build
@@ -1,27 +1,29 @@
 # Installed tools
 gtk_tools = [
-  ['gtk4-query-settings', ['gtk-query-settings.c']],
+  ['gtk4-query-settings', ['gtk-query-settings.c'], []],
   ['gtk4-builder-tool', ['gtk-builder-tool.c',
                          'gtk-builder-tool-simplify.c',
                          'gtk-builder-tool-validate.c',
                          'gtk-builder-tool-enumerate.c',
-                         'gtk-builder-tool-preview.c']],
-  ['gtk4-update-icon-cache', ['updateiconcache.c', 'gtkiconcachevalidator.c']],
-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c', 'gdkpixbufutils.c']],
+                         'gtk-builder-tool-preview.c'], [] ],
+  ['gtk4-update-icon-cache', ['updateiconcache.c'], [ libgtk_static ] ],
+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static ] ],
 ]
 
 if os_unix
-  gtk_tools += [['gtk4-launch', ['gtk-launch.c']]]
+  gtk_tools += [['gtk4-launch', ['gtk-launch.c'], []]]
 endif
 
 foreach tool: gtk_tools
   tool_name = tool.get(0)
   tool_srcs = tool.get(1)
+  tool_libs = tool.get(2)
 
   exe = executable(tool_name,
     sources: tool_srcs,
     include_directories: [confinc],
     c_args: common_cflags,
+    link_with: tool_libs,
     dependencies: libgtk_dep,
     install: true,
   )
diff --git a/gtk/tools/updateiconcache.c b/tools/updateiconcache.c
index 49732156f6..49732156f6 100644
--- a/gtk/tools/updateiconcache.c
+++ b/tools/updateiconcache.c