Move gkbd-keyboard-display to the tools directory

Make it clear that it's not part of the library.

5 files changed, 29 insertions, 29 deletions

diff --git a/libgnomekbd/meson.build b/libgnomekbd/meson.build
index 8737fa8..0cacd60 100644
--- a/libgnomekbd/meson.build
+++ b/libgnomekbd/meson.build
@@ -134,41 +134,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 cf8a9f5..c577dcd 100644
--- a/meson.build
+++ b/meson.build
@@ -49,6 +49,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
index 5b1476c..5b1476c 100644
--- a/libgnomekbd/gkbd-keyboard-display.c
+++ b/tools/gkbd-keyboard-display.c
diff --git a/libgnomekbd/gkbd-keyboard-display.desktop.in.in b/tools/gkbd-keyboard-display.desktop.in.in
index 1662256..1662256 100644
--- a/libgnomekbd/gkbd-keyboard-display.desktop.in.in
+++ b/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',
+)