8 files changed, 41 insertions, 95 deletions
diff --git a/configure.ac b/configure.ac
index ace0859..4356d57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,12 +339,6 @@ data/eom.desktop.in
 data/org.mate.eom.gschema.xml
 data/pixmaps/Makefile
 data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/24x24/Makefile
-data/icons/32x32/Makefile
-data/icons/48x48/Makefile
-data/icons/scalable/Makefile
 doc/Makefile
 doc/reference/Makefile
 doc/reference/version.xml
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index 94ba3d7..0000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-size = 16x16
-actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
-appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
-
-dist_appicons_DATA = \
- apps/eom.png
-dist_actionicons_DATA = \
- actions/eom-plugin.png \
- actions/eom-image-collection.png \
- actions/slideshow-play.png
-
-noinst_DATA = \
- apps/eom.svg \
- actions/eom-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
deleted file mode 100644
index 7d116aa..0000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-size = 22x22
-actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
-appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
-
-dist_appicons_DATA = \
- apps/eom.png
-dist_actionicons_DATA = \
- actions/eom-plugin.png \
- actions/eom-image-collection.png \
- actions/slideshow-play.png
-
-noinst_DATA = \
- apps/eom.svg \
- actions/eom-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
deleted file mode 100644
index 09cbd37..0000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-size = 24x24
-actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
-appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
-
-dist_appicons_DATA = \
- apps/eom.png
-dist_actionicons_DATA = \
- actions/eom-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
deleted file mode 100644
index 0582f08..0000000
--- a/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-size = 32x32
-actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
-appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
-
-dist_appicons_DATA = \
- apps/eom.png
-dist_actionicons_DATA = \
- actions/eom-plugin.png \
- actions/eom-image-collection.png \
- actions/slideshow-play.png
-
-noinst_DATA = \
- apps/eom.svg \
- actions/eom-image-collection.svg \
- actions/eom-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
deleted file mode 100644
index 6c4d701..0000000
--- a/data/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-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/Makefile.am b/data/icons/Makefile.am
index 123b8e3..d54d1db 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,4 +1,44 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable
+
+actioniconsdir = $(pkgdatadir)/icons/hicolor
+appiconsdir = $(datadir)/icons/hicolor
+
+nobase_dist_actionicons_DATA = \
+ 16x16/actions/eom-image-collection.png \
+ 16x16/actions/eom-plugin.png \
+ 16x16/actions/slideshow-play.png \
+ 22x22/actions/eom-image-collection.png \
+ 22x22/actions/eom-plugin.png \
+ 22x22/actions/slideshow-play.png \
+ 24x24/actions/eom-image-collection.png \
+ 24x24/actions/slideshow-play.png \
+ 32x32/actions/eom-image-collection.png \
+ 32x32/actions/eom-plugin.png \
+ 32x32/actions/slideshow-play.png \
+ 48x48/actions/slideshow-play.png
+ scalable/actions/eom-image-collection.svg \
+ scalable/actions/eom-plugin.svg \
+ scalable/actions/slideshow-play.svg
+
+nobase_dist_appicons_DATA = \
+ 16x16/apps/eom.png \
+ 22x22/apps/eom.png \
+ 24x24/apps/eom.png \
+ 32x32/apps/eom.png \
+ scalable/apps/eom.svg
+
+noinst_DATA = \
+ 16x16/actions/eom-plugin.svg \
+ 16x16/actions/slideshow-play.svg \
+ 16x16/apps/eom.svg \
+ 22x22/actions/eom-plugin.svg \
+ 22x22/actions/slideshow-play.svg \
+ 22x22/apps/eom.svg \
+ 32x32/actions/eom-image-collection.svg \
+ 32x32/actions/eom-plugin.svg \
+ 32x32/actions/slideshow-play.svg \
+ 32x32/apps/eom.svg
+
+EXTRA_DIST = $(noinst_DATA)
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
deleted file mode 100644
index 7acb6dc..0000000
--- a/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-size = scalable
-actioniconsdir = $(pkgdatadir)/icons/hicolor/$(size)/actions
-appiconsdir = $(datadir)/icons/hicolor/$(size)/apps
-
-dist_appicons_DATA = \
- apps/eom.svg
-dist_actionicons_DATA = \
- actions/eom-plugin.svg \
- actions/eom-image-collection.svg \
- actions/slideshow-play.svg
-
--include $(top_srcdir)/git.mk