[gtk] Move tools to a subdirectory

[Matthias Clasen <matthiasc src gnome org>]

commit eed19c9269dc2a2e6f27509605f102986880f4fd
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Aug 19 03:41:25 2018 +0000

    Move tools to a subdirectory
    
    A small step towards splitting up gtk/

 gtk/meson.build                         | 38 ++++-----------------------------
 gtk/{ => tools}/encodesymbolic.c        |  0
 gtk/{ => tools}/gdkpixbufutils.c        |  0
 gtk/{ => tools}/gtk-builder-tool.c      |  0
 gtk/{ => tools}/gtk-launch.c            |  0
 gtk/{ => tools}/gtk-query-settings.c    |  0
 gtk/{ => tools}/gtkbuilder.its          |  0
 gtk/{ => tools}/gtkbuilder.loc          |  0
 gtk/{ => tools}/gtkbuilder.rng          |  0
 gtk/{ => tools}/gtkiconcachevalidator.c |  0
 gtk/tools/meson.build                   | 32 +++++++++++++++++++++++++++
 gtk/{ => tools}/updateiconcache.c       |  0
 12 files changed, 36 insertions(+), 34 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 4fb0339355..92b811ee56 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -16,7 +16,7 @@ gtk_cargs = [
 gtk_private_sources = files([
   'fallback-c89.c',
   'fnmatch.c',
-  'gdkpixbufutils.c',
+  'tools/gdkpixbufutils.c',
   'gtkactionhelper.c',
   'gtkactionmuxer.c',
   'gtkactionobservable.c',
@@ -113,7 +113,7 @@ gtk_private_sources = files([
   'gtkhsla.c',
   'gtkicon.c',
   'gtkiconcache.c',
-  'gtkiconcachevalidator.c',
+  'tools/gtkiconcachevalidator.c',
   'gtkiconhelper.c',
   'gtkkineticscrolling.c',
   'gtkkeyhash.c',
@@ -1077,38 +1077,6 @@ libgtk_dep = declare_dependency(sources: gtk_dep_sources,
                                 link_with: libgtk,
                                 link_args: common_ldflags)
 
-# Installed tools
-gtk_tools = [
-  ['gtk4-query-settings', ['gtk-query-settings.c']],
-  ['gtk4-builder-tool', ['gtk-builder-tool.c']],
-  ['gtk4-update-icon-cache', ['updateiconcache.c', 'gtkiconcachevalidator.c']],
-  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c', 'gdkpixbufutils.c']],
-]
-
-if os_unix
-  gtk_tools += [['gtk4-launch', ['gtk-launch.c']]]
-endif
-
-foreach tool: gtk_tools
-  tool_name = tool.get(0)
-  tool_srcs = tool.get(1)
-
-  exe = executable(tool_name, tool_srcs,
-                   include_directories: [confinc],
-                   c_args: gtk_cargs,
-                   dependencies: libgtk_dep,
-                   install: true)
-
-  set_variable(tool_name.underscorify(), exe) # used in testsuites
-endforeach
-
-# Data to install
-install_data('gtkbuilder.rng',
-             install_dir: join_paths(gtk_datadir, 'gtk-4.0'))
-
-install_data('gtkbuilder.loc', 'gtkbuilder.its',
-             install_dir: join_paths(gtk_datadir, 'gettext/its'))
-
 if quartz_enabled
   # HACK: install_data() doesn't allow installing under a different name (#1487)
   # FIXME: or maybe just rename it to gtk-keys.css in the src tree?
@@ -1117,3 +1085,5 @@ if quartz_enabled
                  configuration: configuration_data(),
                  install_dir: join_paths(get_option('datadir'), 'themes/Mac/gtk-4.0'))
 endif
+
+subdir('tools')
diff --git a/gtk/encodesymbolic.c b/gtk/tools/encodesymbolic.c
similarity index 100%
rename from gtk/encodesymbolic.c
rename to gtk/tools/encodesymbolic.c
diff --git a/gtk/gdkpixbufutils.c b/gtk/tools/gdkpixbufutils.c
similarity index 100%
rename from gtk/gdkpixbufutils.c
rename to gtk/tools/gdkpixbufutils.c
diff --git a/gtk/gtk-builder-tool.c b/gtk/tools/gtk-builder-tool.c
similarity index 100%
rename from gtk/gtk-builder-tool.c
rename to gtk/tools/gtk-builder-tool.c
diff --git a/gtk/gtk-launch.c b/gtk/tools/gtk-launch.c
similarity index 100%
rename from gtk/gtk-launch.c
rename to gtk/tools/gtk-launch.c
diff --git a/gtk/gtk-query-settings.c b/gtk/tools/gtk-query-settings.c
similarity index 100%
rename from gtk/gtk-query-settings.c
rename to gtk/tools/gtk-query-settings.c
diff --git a/gtk/gtkbuilder.its b/gtk/tools/gtkbuilder.its
similarity index 100%
rename from gtk/gtkbuilder.its
rename to gtk/tools/gtkbuilder.its
diff --git a/gtk/gtkbuilder.loc b/gtk/tools/gtkbuilder.loc
similarity index 100%
rename from gtk/gtkbuilder.loc
rename to gtk/tools/gtkbuilder.loc
diff --git a/gtk/gtkbuilder.rng b/gtk/tools/gtkbuilder.rng
similarity index 100%
rename from gtk/gtkbuilder.rng
rename to gtk/tools/gtkbuilder.rng
diff --git a/gtk/gtkiconcachevalidator.c b/gtk/tools/gtkiconcachevalidator.c
similarity index 100%
rename from gtk/gtkiconcachevalidator.c
rename to gtk/tools/gtkiconcachevalidator.c
diff --git a/gtk/tools/meson.build b/gtk/tools/meson.build
new file mode 100644
index 0000000000..39dcde097f
--- /dev/null
+++ b/gtk/tools/meson.build
@@ -0,0 +1,32 @@
+# Installed tools
+gtk_tools = [
+  ['gtk4-query-settings', ['gtk-query-settings.c']],
+  ['gtk4-builder-tool', ['gtk-builder-tool.c']],
+  ['gtk4-update-icon-cache', ['updateiconcache.c', 'gtkiconcachevalidator.c']],
+  ['gtk4-encode-symbolic-svg', ['encodesymbolic.c', 'gdkpixbufutils.c']],
+]
+
+if os_unix
+  gtk_tools += [['gtk4-launch', ['gtk-launch.c']]]
+endif
+
+foreach tool: gtk_tools
+  tool_name = tool.get(0)
+  tool_srcs = tool.get(1)
+
+  exe = executable(tool_name, tool_srcs,
+                   include_directories: [confinc],
+                   c_args: gtk_cargs,
+                   dependencies: libgtk_dep,
+                   install: true)
+
+  set_variable(tool_name.underscorify(), exe) # used in testsuites
+endforeach
+
+# Data to install
+install_data('gtkbuilder.rng',
+             install_dir: join_paths(gtk_datadir, 'gtk-4.0'))
+
+install_data('gtkbuilder.loc', 'gtkbuilder.its',
+             install_dir: join_paths(gtk_datadir, 'gettext/its'))
+
diff --git a/gtk/updateiconcache.c b/gtk/tools/updateiconcache.c
similarity index 100%
rename from gtk/updateiconcache.c
rename to gtk/tools/updateiconcache.c