[eog] Merge per-context Makefiles for icons into per-size Makefiles

[Felix Riemann <friemann src gnome org>]

commit 8e89d7b667fb505e8aa17b7ebdd119c52703fda7
Author: Felix Riemann <friemann gnome org>
Date:   Fri Jul 24 21:31:30 2009 +0200

    Merge per-context Makefiles for icons into per-size Makefiles
    
    This started out as a small uncritical test of non-recursive Makefile as
    they were shown for glom today. Turns out it works pretty nicely and
    already removes 2 of 3 Makefiles per size.

 ChangeLog                               |    7 +++++++
 configure.ac                            |   11 -----------
 data/icons/16x16/Makefile.am            |   18 +++++++++++++++++-
 data/icons/16x16/actions/Makefile.am    |   20 --------------------
 data/icons/16x16/apps/Makefile.am       |   17 -----------------
 data/icons/22x22/Makefile.am            |   18 +++++++++++++++++-
 data/icons/22x22/actions/Makefile.am    |   20 --------------------
 data/icons/22x22/apps/Makefile.am       |   17 -----------------
 data/icons/24x24/Makefile.am            |   10 +++++++++-
 data/icons/24x24/actions/Makefile.am    |   15 ---------------
 data/icons/24x24/apps/Makefile.am       |   16 ----------------
 data/icons/32x32/Makefile.am            |   19 ++++++++++++++++++-
 data/icons/32x32/actions/Makefile.am    |   21 ---------------------
 data/icons/32x32/apps/Makefile.am       |   17 -----------------
 data/icons/48x48/Makefile.am            |    6 +++++-
 data/icons/48x48/actions/Makefile.am    |   14 --------------
 data/icons/scalable/Makefile.am         |   10 +++++++++-
 data/icons/scalable/actions/Makefile.am |   19 -------------------
 data/icons/scalable/apps/Makefile.am    |   27 ---------------------------
 19 files changed, 82 insertions(+), 220 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e897bc6..eb35cbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-07-24  Felix Riemann  <friemann gnome org>
 
+	* configure.ac:
+	* data/icons/*/*/Makefile.am:
+	Merge per-context Makefiles for the icons into per-size Makefiles.
+
+
+2009-07-24  Felix Riemann  <friemann gnome org>
+
 	* data/eog.schemas.in:
 	* src/eog-config-keys.h:
 	* src/eog-window.c (eog_window_cmd_file_open):
diff --git a/configure.ac b/configure.ac
index adcce3b..094c289 100644
--- a/configure.ac
+++ b/configure.ac
@@ -405,22 +405,11 @@ data/eog.desktop.in
 data/pixmaps/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
-data/icons/16x16/apps/Makefile
-data/icons/16x16/actions/Makefile
 data/icons/22x22/Makefile
-data/icons/22x22/apps/Makefile
-data/icons/22x22/actions/Makefile
 data/icons/24x24/Makefile
-data/icons/24x24/apps/Makefile
-data/icons/24x24/actions/Makefile
 data/icons/32x32/Makefile
-data/icons/32x32/apps/Makefile
-data/icons/32x32/actions/Makefile
 data/icons/48x48/Makefile
-data/icons/48x48/actions/Makefile
 data/icons/scalable/Makefile
-data/icons/scalable/actions/Makefile
-data/icons/scalable/apps/Makefile
 doc/Makefile
 doc/reference/Makefile
 doc/reference/version.xml
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 58b8e6a..ae21c0b 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1,3 +1,19 @@
-SUBDIRS = apps actions
+size = 16x16
+actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
+appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
+
+dist_appicons_DATA = \
+	apps/eog.png
+dist_actionicons_DATA = \
+	actions/eog-plugin.png	  	\
+	actions/eog-image-collection.png  \
+	actions/slideshow-play.png
+
+noinst_DATA = \
+	apps/eog.svg		\
+	actions/eog-plugin.svg  \
+	actions/slideshow-play.svg
+
+EXTRA_DIST = $(noinst_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
index 58b8e6a..8aa0522 100644
--- a/data/icons/22x22/Makefile.am
+++ b/data/icons/22x22/Makefile.am
@@ -1,3 +1,19 @@
-SUBDIRS = apps actions
+size = 22x22
+actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
+appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
+
+dist_appicons_DATA = \
+	apps/eog.png
+dist_actionicons_DATA = \
+	actions/eog-plugin.png	  	\
+	actions/eog-image-collection.png  \
+	actions/slideshow-play.png
+
+noinst_DATA = \
+	apps/eog.svg		\
+	actions/eog-plugin.svg  \
+	actions/slideshow-play.svg
+
+EXTRA_DIST = $(noinst_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 58b8e6a..e5238b3 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1,3 +1,11 @@
-SUBDIRS = apps actions
+size = 24x24
+actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
+appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
+
+dist_appicons_DATA = \
+	apps/eog.png
+dist_actionicons_DATA = \
+	actions/eog-image-collection.png  \
+	actions/slideshow-play.png
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
index 58b8e6a..f00e775 100644
--- a/data/icons/32x32/Makefile.am
+++ b/data/icons/32x32/Makefile.am
@@ -1,3 +1,20 @@
-SUBDIRS = apps actions
+size = 32x32
+actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
+appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
+
+dist_appicons_DATA = \
+	apps/eog.png
+dist_actionicons_DATA = \
+	actions/eog-plugin.png	  	\
+	actions/eog-image-collection.png  \
+	actions/slideshow-play.png
+
+noinst_DATA = \
+	apps/eog.svg  \
+	actions/eog-image-collection.svg  \
+	actions/eog-plugin.svg  \
+	actions/slideshow-play.svg
+
+EXTRA_DIST = $(noinst_DATA)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
index 6b7db23..6c4d701 100644
--- a/data/icons/48x48/Makefile.am
+++ b/data/icons/48x48/Makefile.am
@@ -1,3 +1,7 @@
-SUBDIRS = actions
+size = 48x48
+actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
+
+dist_actionicons_DATA = \
+	actions/slideshow-play.png
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
index ae03308..a2c6f13 100644
--- a/data/icons/scalable/Makefile.am
+++ b/data/icons/scalable/Makefile.am
@@ -1,4 +1,12 @@
-SUBDIRS = actions apps
+size = scalable
+actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
+appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
 
+dist_appicons_DATA = \
+	apps/eog.svg
+dist_actionicons_DATA = \
+	actions/eog-plugin.svg	  	\
+	actions/eog-image-collection.svg  \
+	actions/slideshow-play.svg
 
 -include $(top_srcdir)/git.mk