[nautilus/wip/csoriano/flatpak] Fix handling of the icons

[Mathieu Bridon <mbridon src gnome org>]

commit b1651cecbed31ed6e5505bf0c914ea3a9967ba50
Author: Mathieu Bridon <bochecha daitauha fr>
Date:   Thu Aug 18 22:49:29 2016 +0200

    Fix handling of the icons

 Makefile.am            |    1 -
 data/Makefile.am       |    2 ++
 data/icons/Makefile.am |   32 +++++++++-----------------------
 3 files changed, 11 insertions(+), 24 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 04a14ae..ba83976 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,6 @@ DIRS =                          \
        test                    \
        data                    \
        po                      \
-       data/icons              \
        docs                    \
        $(NULL)
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 6d16e53..f2cfb7d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,7 @@
 NULL=
 
+SUBDIRS = icons
+
 desktopdir       = $(datadir)/applications
 desktop_in_files =                                     \
        org.gnome.Nautilus.desktop.in                   \
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 3bf06d3..124a6db 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,27 +1,13 @@
-icon16dir = $(datadir)/icons/hicolor/16x16/apps
-icon16_DATA = data/icons/hicolor/16x16/apps/org.gnome.Nautilus.png
-icon22dir = $(datadir)/icons/hicolor/22x22/apps
-icon22_DATA = data/icons/hicolor/22x22/apps/org.gnome.Nautilus.png
-icon24dir = $(datadir)/icons/hicolor/24x24/apps
-icon24_DATA = data/icons/hicolor/24x24/apps/org.gnome.Nautilus.png
-icon32dir = $(datadir)/icons/hicolor/32x32/apps
-icon32_DATA = data/icons/hicolor/32x32/apps/org.gnome.Nautilus.png
-icon48dir = $(datadir)/icons/hicolor/48x48/apps
-icon48_DATA = data/icons/hicolor/48x48/apps/org.gnome.Nautilus.png
-icon256dir = $(datadir)/icons/hicolor/256x256/apps
-icon256_DATA = data/icons/hicolor/256x256/apps/org.gnome.Nautilus.png
-iconsymbolicdir = $(datadir)/icons/hicolor/symbolic/apps
-iconsymbolic_DATA = data/icons/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg
+icondir = $(datadir)/icons
+nobase_icon_DATA = \
+       $(srcdir)/hicolor/16x16/apps/org.gnome.Nautilus.png \
+       $(srcdir)/hicolor/22x22/apps/org.gnome.Nautilus.png \
+       $(srcdir)/hicolor/24x24/apps/org.gnome.Nautilus.png \
+       $(srcdir)/hicolor/32x32/apps/org.gnome.Nautilus.png \
+       $(srcdir)/hicolor/48x48/apps/org.gnome.Nautilus.png \
+       $(srcdir)/hicolor/symbolic/apps/org.gnome.Nautilus-symbolic.svg
 
-icon_files = \
-       $(icon16_DATA) \
-       $(icon22_DATA) \
-       $(icon24_DATA) \
-       $(icon32_DATA) \
-       $(icon48_DATA) \
-       $(icon256_DATA) \
-       $(iconsymbolic_DATA) \
-       data/icons/src/org.gnome.Nautilus.svg
+icon_files = $(nobase_icon_DATA)
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor