build: Relocate icons' directorieswip/inigomartinez/meson

This patch relocates icons' files into the directories that they
are going to be installed, avoiding the need to process directories
or files individually, which makes the installation process faster.

https://bugzilla.gnome.org/show_bug.cgi?id=787638

56 files changed, 4 insertions, 34 deletions

diff --git a/data/icons/16x16/goa-account-facebook.png b/data/icons/hicolor/16x16/apps/goa-account-facebook.png
index d8e414b..d8e414b 100644
--- a/data/icons/16x16/goa-account-facebook.png
+++ b/data/icons/hicolor/16x16/apps/goa-account-facebook.png
diff --git a/data/icons/16x16/goa-account-flickr.png b/data/icons/hicolor/16x16/apps/goa-account-flickr.png
index a81c62c..a81c62c 100644
--- a/data/icons/16x16/goa-account-flickr.png
+++ b/data/icons/hicolor/16x16/apps/goa-account-flickr.png
diff --git a/data/icons/16x16/goa-account-foursquare.png b/data/icons/hicolor/16x16/apps/goa-account-foursquare.png
index fc41da8..fc41da8 100644
--- a/data/icons/16x16/goa-account-foursquare.png
+++ b/data/icons/hicolor/16x16/apps/goa-account-foursquare.png
diff --git a/data/icons/16x16/goa-account-google.png b/data/icons/hicolor/16x16/apps/goa-account-google.png
index 241b225..241b225 100644
--- a/data/icons/16x16/goa-account-google.png
+++ b/data/icons/hicolor/16x16/apps/goa-account-google.png
diff --git a/data/icons/16x16/goa-account-msn.png b/data/icons/hicolor/16x16/apps/goa-account-msn.png
index 71f51d0..71f51d0 100644
--- a/data/icons/16x16/goa-account-msn.png
+++ b/data/icons/hicolor/16x16/apps/goa-account-msn.png
diff --git a/data/icons/16x16/goa-account-owncloud.png b/data/icons/hicolor/16x16/apps/goa-account-owncloud.png
index 40d028c..40d028c 100644
--- a/data/icons/16x16/goa-account-owncloud.png
+++ b/data/icons/hicolor/16x16/apps/goa-account-owncloud.png
diff --git a/data/icons/16x16/goa-account-pocket.png b/data/icons/hicolor/16x16/apps/goa-account-pocket.png
index d3038c4..d3038c4 100644
--- a/data/icons/16x16/goa-account-pocket.png
+++ b/data/icons/hicolor/16x16/apps/goa-account-pocket.png
diff --git a/data/icons/16x16/goa-account-todoist.png b/data/icons/hicolor/16x16/apps/goa-account-todoist.png
index 855cfda..855cfda 100644
--- a/data/icons/16x16/goa-account-todoist.png
+++ b/data/icons/hicolor/16x16/apps/goa-account-todoist.png
diff --git a/data/icons/16x16/goa-account.png b/data/icons/hicolor/16x16/apps/goa-account.png
index a06b11e..a06b11e 100644
--- a/data/icons/16x16/goa-account.png
+++ b/data/icons/hicolor/16x16/apps/goa-account.png
diff --git a/data/icons/22x22/goa-account-facebook.png b/data/icons/hicolor/22x22/apps/goa-account-facebook.png
index 4a0e058..4a0e058 100644
--- a/data/icons/22x22/goa-account-facebook.png
+++ b/data/icons/hicolor/22x22/apps/goa-account-facebook.png
diff --git a/data/icons/22x22/goa-account-flickr.png b/data/icons/hicolor/22x22/apps/goa-account-flickr.png
index 30ffa83..30ffa83 100644
--- a/data/icons/22x22/goa-account-flickr.png
+++ b/data/icons/hicolor/22x22/apps/goa-account-flickr.png
diff --git a/data/icons/22x22/goa-account-foursquare.png b/data/icons/hicolor/22x22/apps/goa-account-foursquare.png
index cc28bb9..cc28bb9 100644
--- a/data/icons/22x22/goa-account-foursquare.png
+++ b/data/icons/hicolor/22x22/apps/goa-account-foursquare.png
diff --git a/data/icons/22x22/goa-account-google.png b/data/icons/hicolor/22x22/apps/goa-account-google.png
index 6fd2c94..6fd2c94 100644
--- a/data/icons/22x22/goa-account-google.png
+++ b/data/icons/hicolor/22x22/apps/goa-account-google.png
diff --git a/data/icons/22x22/goa-account-msn.png b/data/icons/hicolor/22x22/apps/goa-account-msn.png
index 8a3832f..8a3832f 100644
--- a/data/icons/22x22/goa-account-msn.png
+++ b/data/icons/hicolor/22x22/apps/goa-account-msn.png
diff --git a/data/icons/22x22/goa-account-owncloud.png b/data/icons/hicolor/22x22/apps/goa-account-owncloud.png
index 960d1c1..960d1c1 100644
--- a/data/icons/22x22/goa-account-owncloud.png
+++ b/data/icons/hicolor/22x22/apps/goa-account-owncloud.png
diff --git a/data/icons/22x22/goa-account-pocket.png b/data/icons/hicolor/22x22/apps/goa-account-pocket.png
index 86ceadd..86ceadd 100644
--- a/data/icons/22x22/goa-account-pocket.png
+++ b/data/icons/hicolor/22x22/apps/goa-account-pocket.png
diff --git a/data/icons/22x22/goa-account-todoist.png b/data/icons/hicolor/22x22/apps/goa-account-todoist.png
index e74be0b..e74be0b 100644
--- a/data/icons/22x22/goa-account-todoist.png
+++ b/data/icons/hicolor/22x22/apps/goa-account-todoist.png
diff --git a/data/icons/22x22/goa-account.png b/data/icons/hicolor/22x22/apps/goa-account.png
index 89dc92f..89dc92f 100644
--- a/data/icons/22x22/goa-account.png
+++ b/data/icons/hicolor/22x22/apps/goa-account.png
diff --git a/data/icons/24x24/goa-account-facebook.png b/data/icons/hicolor/24x24/apps/goa-account-facebook.png
index d8127e6..d8127e6 100644
--- a/data/icons/24x24/goa-account-facebook.png
+++ b/data/icons/hicolor/24x24/apps/goa-account-facebook.png
diff --git a/data/icons/24x24/goa-account-flickr.png b/data/icons/hicolor/24x24/apps/goa-account-flickr.png
index 019e298..019e298 100644
--- a/data/icons/24x24/goa-account-flickr.png
+++ b/data/icons/hicolor/24x24/apps/goa-account-flickr.png
diff --git a/data/icons/24x24/goa-account-foursquare.png b/data/icons/hicolor/24x24/apps/goa-account-foursquare.png
index 349226d..349226d 100644
--- a/data/icons/24x24/goa-account-foursquare.png
+++ b/data/icons/hicolor/24x24/apps/goa-account-foursquare.png
diff --git a/data/icons/24x24/goa-account-google.png b/data/icons/hicolor/24x24/apps/goa-account-google.png
index 7fc4547..7fc4547 100644
--- a/data/icons/24x24/goa-account-google.png
+++ b/data/icons/hicolor/24x24/apps/goa-account-google.png
diff --git a/data/icons/24x24/goa-account-msn.png b/data/icons/hicolor/24x24/apps/goa-account-msn.png
index 96c2fe7..96c2fe7 100644
--- a/data/icons/24x24/goa-account-msn.png
+++ b/data/icons/hicolor/24x24/apps/goa-account-msn.png
diff --git a/data/icons/24x24/goa-account-owncloud.png b/data/icons/hicolor/24x24/apps/goa-account-owncloud.png
index 4bf2f10..4bf2f10 100644
--- a/data/icons/24x24/goa-account-owncloud.png
+++ b/data/icons/hicolor/24x24/apps/goa-account-owncloud.png
diff --git a/data/icons/24x24/goa-account-pocket.png b/data/icons/hicolor/24x24/apps/goa-account-pocket.png
index 569d965..569d965 100644
--- a/data/icons/24x24/goa-account-pocket.png
+++ b/data/icons/hicolor/24x24/apps/goa-account-pocket.png
diff --git a/data/icons/24x24/goa-account-todoist.png b/data/icons/hicolor/24x24/apps/goa-account-todoist.png
index cbd6466..cbd6466 100644
--- a/data/icons/24x24/goa-account-todoist.png
+++ b/data/icons/hicolor/24x24/apps/goa-account-todoist.png
diff --git a/data/icons/24x24/goa-account.png b/data/icons/hicolor/24x24/apps/goa-account.png
index 3860c2c..3860c2c 100644
--- a/data/icons/24x24/goa-account.png
+++ b/data/icons/hicolor/24x24/apps/goa-account.png
diff --git a/data/icons/256x256/goa-account.png b/data/icons/hicolor/256x256/apps/goa-account.png
index c0b2239..c0b2239 100644
--- a/data/icons/256x256/goa-account.png
+++ b/data/icons/hicolor/256x256/apps/goa-account.png
diff --git a/data/icons/32x32/goa-account-facebook.png b/data/icons/hicolor/32x32/apps/goa-account-facebook.png
index 7837505..7837505 100644
--- a/data/icons/32x32/goa-account-facebook.png
+++ b/data/icons/hicolor/32x32/apps/goa-account-facebook.png
diff --git a/data/icons/32x32/goa-account-flickr.png b/data/icons/hicolor/32x32/apps/goa-account-flickr.png
index da7af59..da7af59 100644
--- a/data/icons/32x32/goa-account-flickr.png
+++ b/data/icons/hicolor/32x32/apps/goa-account-flickr.png
diff --git a/data/icons/32x32/goa-account-foursquare.png b/data/icons/hicolor/32x32/apps/goa-account-foursquare.png
index a72375a..a72375a 100644
--- a/data/icons/32x32/goa-account-foursquare.png
+++ b/data/icons/hicolor/32x32/apps/goa-account-foursquare.png
diff --git a/data/icons/32x32/goa-account-google.png b/data/icons/hicolor/32x32/apps/goa-account-google.png
index cc371f4..cc371f4 100644
--- a/data/icons/32x32/goa-account-google.png
+++ b/data/icons/hicolor/32x32/apps/goa-account-google.png
diff --git a/data/icons/32x32/goa-account-msn.png b/data/icons/hicolor/32x32/apps/goa-account-msn.png
index f67aa22..f67aa22 100644
--- a/data/icons/32x32/goa-account-msn.png
+++ b/data/icons/hicolor/32x32/apps/goa-account-msn.png
diff --git a/data/icons/32x32/goa-account-owncloud.png b/data/icons/hicolor/32x32/apps/goa-account-owncloud.png
index b748019..b748019 100644
--- a/data/icons/32x32/goa-account-owncloud.png
+++ b/data/icons/hicolor/32x32/apps/goa-account-owncloud.png
diff --git a/data/icons/32x32/goa-account-pocket.png b/data/icons/hicolor/32x32/apps/goa-account-pocket.png
index 3f4cd66..3f4cd66 100644
--- a/data/icons/32x32/goa-account-pocket.png
+++ b/data/icons/hicolor/32x32/apps/goa-account-pocket.png
diff --git a/data/icons/32x32/goa-account-todoist.png b/data/icons/hicolor/32x32/apps/goa-account-todoist.png
index 7c29d64..7c29d64 100644
--- a/data/icons/32x32/goa-account-todoist.png
+++ b/data/icons/hicolor/32x32/apps/goa-account-todoist.png
diff --git a/data/icons/32x32/goa-account.png b/data/icons/hicolor/32x32/apps/goa-account.png
index 9e641ec..9e641ec 100644
--- a/data/icons/32x32/goa-account.png
+++ b/data/icons/hicolor/32x32/apps/goa-account.png
diff --git a/data/icons/48x48/goa-account-facebook.png b/data/icons/hicolor/48x48/apps/goa-account-facebook.png
index 33b746a..33b746a 100644
--- a/data/icons/48x48/goa-account-facebook.png
+++ b/data/icons/hicolor/48x48/apps/goa-account-facebook.png
diff --git a/data/icons/48x48/goa-account-flickr.png b/data/icons/hicolor/48x48/apps/goa-account-flickr.png
index 15a2a95..15a2a95 100644
--- a/data/icons/48x48/goa-account-flickr.png
+++ b/data/icons/hicolor/48x48/apps/goa-account-flickr.png
diff --git a/data/icons/48x48/goa-account-foursquare.png b/data/icons/hicolor/48x48/apps/goa-account-foursquare.png
index 0e14443..0e14443 100644
--- a/data/icons/48x48/goa-account-foursquare.png
+++ b/data/icons/hicolor/48x48/apps/goa-account-foursquare.png
diff --git a/data/icons/48x48/goa-account-google.png b/data/icons/hicolor/48x48/apps/goa-account-google.png
index 8d80315..8d80315 100644
--- a/data/icons/48x48/goa-account-google.png
+++ b/data/icons/hicolor/48x48/apps/goa-account-google.png
diff --git a/data/icons/48x48/goa-account-msn.png b/data/icons/hicolor/48x48/apps/goa-account-msn.png
index 0199248..0199248 100644
--- a/data/icons/48x48/goa-account-msn.png
+++ b/data/icons/hicolor/48x48/apps/goa-account-msn.png
diff --git a/data/icons/48x48/goa-account-owncloud.png b/data/icons/hicolor/48x48/apps/goa-account-owncloud.png
index 80f7f7c..80f7f7c 100644
--- a/data/icons/48x48/goa-account-owncloud.png
+++ b/data/icons/hicolor/48x48/apps/goa-account-owncloud.png
diff --git a/data/icons/48x48/goa-account-pocket.png b/data/icons/hicolor/48x48/apps/goa-account-pocket.png
index a8a9dc4..a8a9dc4 100644
--- a/data/icons/48x48/goa-account-pocket.png
+++ b/data/icons/hicolor/48x48/apps/goa-account-pocket.png
diff --git a/data/icons/48x48/goa-account-todoist.png b/data/icons/hicolor/48x48/apps/goa-account-todoist.png
index 449e452..449e452 100644
--- a/data/icons/48x48/goa-account-todoist.png
+++ b/data/icons/hicolor/48x48/apps/goa-account-todoist.png
diff --git a/data/icons/48x48/goa-account.png b/data/icons/hicolor/48x48/apps/goa-account.png
index 5edaf1c..5edaf1c 100644
--- a/data/icons/48x48/goa-account.png
+++ b/data/icons/hicolor/48x48/apps/goa-account.png
diff --git a/data/icons/96x96/goa-account-facebook.png b/data/icons/hicolor/96x96/apps/goa-account-facebook.png
index 465b25f..465b25f 100644
--- a/data/icons/96x96/goa-account-facebook.png
+++ b/data/icons/hicolor/96x96/apps/goa-account-facebook.png
diff --git a/data/icons/96x96/goa-account-flickr.png b/data/icons/hicolor/96x96/apps/goa-account-flickr.png
index 58d76dc..58d76dc 100644
--- a/data/icons/96x96/goa-account-flickr.png
+++ b/data/icons/hicolor/96x96/apps/goa-account-flickr.png
diff --git a/data/icons/96x96/goa-account-foursquare.png b/data/icons/hicolor/96x96/apps/goa-account-foursquare.png
index fa25a75..fa25a75 100644
--- a/data/icons/96x96/goa-account-foursquare.png
+++ b/data/icons/hicolor/96x96/apps/goa-account-foursquare.png
diff --git a/data/icons/96x96/goa-account-google.png b/data/icons/hicolor/96x96/apps/goa-account-google.png
index 01b91b5..01b91b5 100644
--- a/data/icons/96x96/goa-account-google.png
+++ b/data/icons/hicolor/96x96/apps/goa-account-google.png
diff --git a/data/icons/96x96/goa-account-msn.png b/data/icons/hicolor/96x96/apps/goa-account-msn.png
index a604ba7..a604ba7 100644
--- a/data/icons/96x96/goa-account-msn.png
+++ b/data/icons/hicolor/96x96/apps/goa-account-msn.png
diff --git a/data/icons/96x96/goa-account-owncloud.png b/data/icons/hicolor/96x96/apps/goa-account-owncloud.png
index 53ed8b0..53ed8b0 100644
--- a/data/icons/96x96/goa-account-owncloud.png
+++ b/data/icons/hicolor/96x96/apps/goa-account-owncloud.png
diff --git a/data/icons/96x96/goa-account-pocket.png b/data/icons/hicolor/96x96/apps/goa-account-pocket.png
index 42513d6..42513d6 100644
--- a/data/icons/96x96/goa-account-pocket.png
+++ b/data/icons/hicolor/96x96/apps/goa-account-pocket.png
diff --git a/data/icons/96x96/goa-account-todoist.png b/data/icons/hicolor/96x96/apps/goa-account-todoist.png
index ea9c139..ea9c139 100644
--- a/data/icons/96x96/goa-account-todoist.png
+++ b/data/icons/hicolor/96x96/apps/goa-account-todoist.png
diff --git a/data/icons/96x96/goa-account.png b/data/icons/hicolor/96x96/apps/goa-account.png
index fdb7399..fdb7399 100644
--- a/data/icons/96x96/goa-account.png
+++ b/data/icons/hicolor/96x96/apps/goa-account.png
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 866e2f9..4535ad2 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,34 +1,4 @@
-icon_data = [
-  'goa-account-facebook.png',
-  'goa-account-flickr.png',
-  'goa-account-foursquare.png',
-  'goa-account-google.png',
-  'goa-account-msn.png',
-  'goa-account-owncloud.png',
-  'goa-account.png',
-  'goa-account-pocket.png',
-  'goa-account-todoist.png'
-]
-
-icon_data_256 = ['goa-account.png']
-
-icons = [
-  ['16x16', icon_data],
-  ['22x22', icon_data],
-  ['24x24', icon_data],
-  ['32x32', icon_data],
-  ['48x48', icon_data],
-  ['96x96', icon_data],
-  ['256x256', icon_data_256]
-]
-
-foreach icon: icons
-  icon_dir = join_paths(goa_datadir, 'icons', 'hicolor', icon[0], 'apps')
-
-  foreach data: icon[1]
-    install_data(
-      join_paths(icon[0], data),
-      install_dir: icon_dir
-    )
-  endforeach
-endforeach
+install_subdir(
+  'hicolor',
+  install_dir: join_paths(goa_datadir, 'icons')
+)