Use the Automake variable nobase_dist_icons_DATA

nobase_dist_icons_DATA:
  nobase: It tells that the files have same directory
          structure as the installed on system
  dist:   It tells that the files should be included in the
          distribution tarball
  icons:  It tells where to install the files
  DATA:   It tells that they are data files, and they do
          not need to be compiled

13 files changed, 27 insertions, 181 deletions

diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index c89b441..0000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps	
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
deleted file mode 100644
index 479869f..0000000
--- a/data/icons/16x16/actions/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	add-files-to-archive.png	\
-	add-folder-to-archive.png	\
-	extract-archive.png
-
-noinst_DATA = 
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
--include $(top_srcdir)/git.mk
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
deleted file mode 100644
index 740023f..0000000
--- a/data/icons/16x16/apps/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 16x16
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	engrampa.png
-
-noinst_DATA =
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
deleted file mode 100644
index c1213be..0000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = apps	
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
deleted file mode 100644
index f1af54e..0000000
--- a/data/icons/22x22/apps/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 22x22
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	engrampa.png
-
-noinst_DATA =
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
--include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
deleted file mode 100644
index 4497479..0000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = actions apps
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
deleted file mode 100644
index 0af6b6f..0000000
--- a/data/icons/24x24/actions/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	add-files-to-archive.png	\
-	add-folder-to-archive.png	\
-	extract-archive.png
-
-noinst_DATA = 
-
-EXTRA_DIST = \
-	$(icons_DATA)	\
-	$(noinst_DATA)
--include $(top_srcdir)/git.mk
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
deleted file mode 100644
index a4be694..0000000
--- a/data/icons/24x24/apps/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	engrampa.png
-
-noinst_DATA =
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
deleted file mode 100644
index c1213be..0000000
--- a/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = apps	
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/32x32/apps/Makefile.am
deleted file mode 100644
index dede0b6..0000000
--- a/data/icons/32x32/apps/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 32x32
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	engrampa.png
-
-noinst_DATA =
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
--include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 5a56f89..3817ee8 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,3 +1,29 @@
-SUBDIRS = 16x16 22x22 24x24 32x32 scalable
+iconsdir = $(datadir)/icons/hicolor
+
+nobase_dist_icons_DATA = \
+	16x16/actions/add-files-to-archive.png \
+	16x16/actions/add-folder-to-archive.png \
+	16x16/actions/extract-archive.png \
+	16x16/apps/engrampa.png \
+	22x22/apps/engrampa.png \
+	24x24/actions/add-files-to-archive.png \
+	24x24/actions/add-folder-to-archive.png \
+	24x24/actions/extract-archive.png \
+	24x24/apps/engrampa.png \
+	32x32/apps/engrampa.png \
+	scalable/apps/engrampa.svg
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
 
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
deleted file mode 100644
index c1213be..0000000
--- a/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = apps	
-
--include $(top_srcdir)/git.mk
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
deleted file mode 100644
index 01b8e2c..0000000
--- a/data/icons/scalable/apps/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = scalable
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = \
-	engrampa.svg
-
-noinst_DATA =
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
--include $(top_srcdir)/git.mk