[libgnomekbd/next] Move gkbd-keyboard-display to the tools directory

[Corentin Noël <corentinnoel src gnome org>]

commit 96fd578f4b88b0016b76e9e4e242c2904e62340d
Author: Corentin Noël <corentin noel collabora com>
Date:   Sun Aug 7 22:10:04 2022 +0200

    Move gkbd-keyboard-display to the tools directory
    
    Make it clear that it's not part of the library.

 libgnomekbd/meson.build                            | 29 ----------------------
 meson.build                                        |  1 +
 {libgnomekbd => tools}/gkbd-keyboard-display.c     |  0
 .../gkbd-keyboard-display.desktop.in.in            |  0
 tools/meson.build                                  | 28 +++++++++++++++++++++
 5 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/libgnomekbd/meson.build b/libgnomekbd/meson.build
index 78e9fe5..261aeb2 100644
--- a/libgnomekbd/meson.build
+++ b/libgnomekbd/meson.build
@@ -120,41 +120,12 @@ libgnomekbdui_dep = declare_dependency(
   sources: [config_h, gkbd_keyboard_drawing_marshal],
 )
 
-gkbd_keyboard_display_exe = executable(
-  'gkbd-keyboard-display',
-  'gkbd-keyboard-display.c',
-  dependencies: libgnomekbdui_dep,
-  include_directories: root_include,
-  c_args: [
-    '-DGNOMELOCALEDIR="@0@"'.format(get_option('prefix') / get_option('datadir') / 'locale')
-  ],
-  install: true,
-)
-
 install_headers(
   libgnomekbd_headers,
   libgnomekbdui_headers,
   subdir: 'libgnomekbd',
 )
 
-gkbd_keyboard_display_cfg = configuration_data()
-gkbd_keyboard_display_cfg.set('VERSION', meson.project_version())
-
-gkbd_keyboard_display_in = configure_file(
-  input: 'gkbd-keyboard-display.desktop.in.in',
-  output: 'gkbd-keyboard-display.desktop.in',
-  configuration: gkbd_keyboard_display_cfg,
-)
-
-i18n.merge_file(
-  input: gkbd_keyboard_display_in,
-  output: 'gkbd-keyboard-display.desktop',
-  po_dir: '../po',
-  type: 'desktop',
-  install: true,
-  install_dir: get_option('prefix') / get_option('datadir') / 'applications',
-)
-
 install_data(
   'libgnomekbd.convert',
   install_dir: get_option('prefix') / get_option('datadir') / 'GConf' / 'gsettings'
diff --git a/meson.build b/meson.build
index f7027df..69681d0 100644
--- a/meson.build
+++ b/meson.build
@@ -47,6 +47,7 @@ config_h = configure_file(
 root_include = include_directories('.')
 
 subdir('libgnomekbd')
+subdir('tools')
 
 subdir('po')
 
diff --git a/libgnomekbd/gkbd-keyboard-display.c b/tools/gkbd-keyboard-display.c
similarity index 100%
rename from libgnomekbd/gkbd-keyboard-display.c
rename to tools/gkbd-keyboard-display.c
diff --git a/libgnomekbd/gkbd-keyboard-display.desktop.in.in b/tools/gkbd-keyboard-display.desktop.in.in
similarity index 100%
rename from libgnomekbd/gkbd-keyboard-display.desktop.in.in
rename to tools/gkbd-keyboard-display.desktop.in.in
diff --git a/tools/meson.build b/tools/meson.build
new file mode 100644
index 0000000..8f9671c
--- /dev/null
+++ b/tools/meson.build
@@ -0,0 +1,28 @@
+gkbd_keyboard_display_exe = executable(
+  'gkbd-keyboard-display',
+  'gkbd-keyboard-display.c',
+  dependencies: libgnomekbdui_dep,
+  include_directories: root_include,
+  c_args: [
+    '-DGNOMELOCALEDIR="@0@"'.format(get_option('prefix') / get_option('datadir') / 'locale')
+  ],
+  install: true,
+)
+
+gkbd_keyboard_display_cfg = configuration_data()
+gkbd_keyboard_display_cfg.set('VERSION', meson.project_version())
+
+gkbd_keyboard_display_in = configure_file(
+  input: 'gkbd-keyboard-display.desktop.in.in',
+  output: 'gkbd-keyboard-display.desktop.in',
+  configuration: gkbd_keyboard_display_cfg,
+)
+
+i18n.merge_file(
+  input: gkbd_keyboard_display_in,
+  output: 'gkbd-keyboard-display.desktop',
+  po_dir: '../po',
+  type: 'desktop',
+  install: true,
+  install_dir: get_option('prefix') / get_option('datadir') / 'applications',
+)