Move appdata files under its own subdir

We're going to add more data in a little bit.

4 files changed, 25 insertions, 23 deletions

diff --git a/data/gnome-dictionary-appdata.png b/data/appdata/gnome-dictionary-appdata.png
index 570ff51..570ff51 100644
--- a/data/gnome-dictionary-appdata.png
+++ b/data/appdata/gnome-dictionary-appdata.png
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
new file mode 100644
index 0000000..1dc4ed7
--- /dev/null
+++ b/data/appdata/meson.build
@@ -0,0 +1,23 @@
+appdata_conf = configuration_data()
+appdata_conf.set('application_id', application_id)
+i18n.merge_file('appdata',
+  input: configure_file(
+    input: 'org.gnome.Dictionary.appdata.xml.in.in',
+    output: 'org.gnome.Dictionary.appdata.xml.in',
+    configuration: appdata_conf,
+  ),
+  output: application_id + '.appdata.xml',
+  install: true,
+  install_dir: gdict_datadir / 'metainfo',
+  po_dir: po_dir,
+)
+
+appstream_util = find_program('appstream-util', required: false)
+if appstream_util.found()
+  test('validate-appdata',
+    appstream_util,
+    args: [ 'validate', '--nonet', application_id + '.appdata.xml' ],
+    workdir: meson.current_build_dir(),
+  )
+endif
+
diff --git a/data/org.gnome.Dictionary.appdata.xml.in.in b/data/appdata/org.gnome.Dictionary.appdata.xml.in.in
index 4adfa79..4adfa79 100644
--- a/data/org.gnome.Dictionary.appdata.xml.in.in
+++ b/data/appdata/org.gnome.Dictionary.appdata.xml.in.in
diff --git a/data/meson.build b/data/meson.build
index a143741..b27e64b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,3 +1,5 @@
+subdir('appdata')
+
 desktop_conf = configuration_data()
 desktop_conf.set('icon', application_id)
 desktop_conf.set('application_id', application_id)
@@ -23,29 +25,6 @@ if desktop_file_validate.found()
   )
 endif
 
-appdata_conf = configuration_data()
-appdata_conf.set('application_id', application_id)
-i18n.merge_file('appdata',
-  input: configure_file(
-    input: 'org.gnome.Dictionary.appdata.xml.in.in',
-    output: 'org.gnome.Dictionary.appdata.xml.in',
-    configuration: appdata_conf,
-  ),
-  output: application_id + '.appdata.xml',
-  install: true,
-  install_dir: gdict_datadir / 'metainfo',
-  po_dir: po_dir,
-)
-
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
-  test('validate-appdata',
-    appstream_util,
-    args: [ 'validate', '--nonet', application_id + '.appdata.xml' ],
-    workdir: meson.current_build_dir(),
-  )
-endif
-
 service_conf = configuration_data ()
 service_conf.set('bindir', gdict_bindir)
 service_conf.set('application_id', application_id)