Simplify the installation process of the icons

25 files changed, 17 insertions, 619 deletions

diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
deleted file mode 100644
index c755e92..0000000
--- a/data/icons/16x16/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = actions apps status
-
diff --git a/data/icons/16x16/actions/Makefile.am b/data/icons/16x16/actions/Makefile.am
deleted file mode 100644
index 1297aad..0000000
--- a/data/icons/16x16/actions/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  \
-	gpm-hibernate.png	  \
-	gpm-suspend.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
deleted file mode 100644
index 3e43a5b..0000000
--- a/data/icons/16x16/apps/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 16x16
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	mate-brightness-applet.png	\
-	mate-inhibit-applet.png	\
-	mate-power-manager.png		\
-	mate-power-statistics.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/16x16/status/Makefile.am b/data/icons/16x16/status/Makefile.am
deleted file mode 100644
index 79787e9..0000000
--- a/data/icons/16x16/status/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 16x16
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-
-icons_DATA = 			        \
-	gpm-ac-adapter.png		\
-	gpm-brightness-lcd.png		\
-	gpm-brightness-kbd.png		\
-	gpm-brightness-lcd-disabled.png	\
-	gpm-brightness-kbd-disabled.png	\
-	gpm-brightness-lcd-invalid.png	\
-	gpm-brightness-kbd-invalid.png	\
-	gpm-inhibit.png			\
-	gpm-inhibit-invalid.png		\
-	gpm-keyboard-000.png		\
-	gpm-keyboard-020.png		\
-	gpm-keyboard-040.png		\
-	gpm-keyboard-060.png		\
-	gpm-keyboard-080.png		\
-	gpm-keyboard-100.png		\
-	gpm-phone-000.png		\
-	gpm-phone-020.png		\
-	gpm-phone-040.png		\
-	gpm-phone-060.png		\
-	gpm-phone-080.png		\
-	gpm-phone-100.png		\
-	gpm-mouse-000.png		\
-	gpm-mouse-020.png		\
-	gpm-mouse-040.png		\
-	gpm-mouse-060.png		\
-	gpm-mouse-080.png		\
-	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
-	gpm-ups-000.png			\
-	gpm-ups-020.png			\
-	gpm-ups-040.png			\
-	gpm-ups-060.png			\
-	gpm-ups-080.png			\
-	gpm-ups-100.png			\
-	gpm-ups-000-charging.png	\
-	gpm-ups-020-charging.png	\
-	gpm-ups-040-charging.png	\
-	gpm-ups-060-charging.png	\
-	gpm-ups-080-charging.png	\
-	gpm-ups-100-charging.png	\
-	gpm-ups-missing.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
diff --git a/data/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
deleted file mode 100644
index c755e92..0000000
--- a/data/icons/22x22/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = actions apps status
-
diff --git a/data/icons/22x22/actions/Makefile.am b/data/icons/22x22/actions/Makefile.am
deleted file mode 100644
index e69fab1..0000000
--- a/data/icons/22x22/actions/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  \
-	gpm-hibernate.png	  \
-	gpm-suspend.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
deleted file mode 100644
index 78ab6ac..0000000
--- a/data/icons/22x22/apps/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 22x22
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	mate-brightness-applet.png	\
-	mate-inhibit-applet.png	\
-	mate-power-manager.png		\
-	mate-power-statistics.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/22x22/status/Makefile.am b/data/icons/22x22/status/Makefile.am
deleted file mode 100644
index 57e2f97..0000000
--- a/data/icons/22x22/status/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 22x22
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-
-icons_DATA = 			        \
-	gpm-ac-adapter.png		\
-	gpm-brightness-lcd.png		\
-	gpm-brightness-kbd.png		\
-	gpm-brightness-lcd-disabled.png	\
-	gpm-brightness-kbd-disabled.png	\
-	gpm-brightness-lcd-invalid.png	\
-	gpm-brightness-kbd-invalid.png	\
-	gpm-inhibit.png			\
-	gpm-inhibit-invalid.png		\
-	gpm-keyboard-000.png		\
-	gpm-keyboard-020.png		\
-	gpm-keyboard-040.png		\
-	gpm-keyboard-060.png		\
-	gpm-keyboard-080.png		\
-	gpm-keyboard-100.png		\
-	gpm-phone-000.png		\
-	gpm-phone-020.png		\
-	gpm-phone-040.png		\
-	gpm-phone-060.png		\
-	gpm-phone-080.png		\
-	gpm-phone-100.png		\
-	gpm-mouse-000.png		\
-	gpm-mouse-020.png		\
-	gpm-mouse-040.png		\
-	gpm-mouse-060.png		\
-	gpm-mouse-080.png		\
-	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
-	gpm-ups-000.png			\
-	gpm-ups-020.png			\
-	gpm-ups-040.png			\
-	gpm-ups-060.png			\
-	gpm-ups-080.png			\
-	gpm-ups-100.png			\
-	gpm-ups-000-charging.png	\
-	gpm-ups-020-charging.png	\
-	gpm-ups-040-charging.png	\
-	gpm-ups-060-charging.png	\
-	gpm-ups-080-charging.png	\
-	gpm-ups-100-charging.png	\
-	gpm-ups-missing.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
deleted file mode 100644
index c755e92..0000000
--- a/data/icons/24x24/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = actions apps status
-
diff --git a/data/icons/24x24/actions/Makefile.am b/data/icons/24x24/actions/Makefile.am
deleted file mode 100644
index bb9e922..0000000
--- a/data/icons/24x24/actions/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  \
-	gpm-hibernate.png	  \
-	gpm-suspend.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
deleted file mode 100644
index adc237f..0000000
--- a/data/icons/24x24/apps/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 24x24
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	mate-brightness-applet.png	\
-	mate-inhibit-applet.png	\
-	mate-power-manager.png		\
-	mate-power-statistics.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/24x24/status/Makefile.am b/data/icons/24x24/status/Makefile.am
deleted file mode 100644
index 4a1b2db..0000000
--- a/data/icons/24x24/status/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 24x24
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-
-icons_DATA = 			        \
-	gpm-ac-adapter.png		\
-	gpm-brightness-lcd.png		\
-	gpm-brightness-kbd.png		\
-	gpm-brightness-lcd-disabled.png	\
-	gpm-brightness-kbd-disabled.png	\
-	gpm-brightness-lcd-invalid.png	\
-	gpm-brightness-kbd-invalid.png	\
-	gpm-inhibit.png			\
-	gpm-inhibit-invalid.png		\
-	gpm-keyboard-000.png		\
-	gpm-keyboard-020.png		\
-	gpm-keyboard-040.png		\
-	gpm-keyboard-060.png		\
-	gpm-keyboard-080.png		\
-	gpm-keyboard-100.png		\
-	gpm-phone-000.png		\
-	gpm-phone-020.png		\
-	gpm-phone-040.png		\
-	gpm-phone-060.png		\
-	gpm-phone-080.png		\
-	gpm-phone-100.png		\
-	gpm-mouse-000.png		\
-	gpm-mouse-020.png		\
-	gpm-mouse-040.png		\
-	gpm-mouse-060.png		\
-	gpm-mouse-080.png		\
-	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
-	gpm-ups-000.png			\
-	gpm-ups-020.png			\
-	gpm-ups-040.png			\
-	gpm-ups-060.png			\
-	gpm-ups-080.png			\
-	gpm-ups-100.png			\
-	gpm-ups-000-charging.png	\
-	gpm-ups-020-charging.png	\
-	gpm-ups-040-charging.png	\
-	gpm-ups-060-charging.png	\
-	gpm-ups-080-charging.png	\
-	gpm-ups-100-charging.png	\
-	gpm-ups-missing.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
diff --git a/data/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
deleted file mode 100644
index c755e92..0000000
--- a/data/icons/32x32/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = actions apps status
-
diff --git a/data/icons/32x32/actions/Makefile.am b/data/icons/32x32/actions/Makefile.am
deleted file mode 100644
index ac4b652..0000000
--- a/data/icons/32x32/actions/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  \
-	gpm-hibernate.png	  \
-	gpm-suspend.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/32x32/apps/Makefile.am b/data/icons/32x32/apps/Makefile.am
deleted file mode 100644
index 4c65873..0000000
--- a/data/icons/32x32/apps/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 32x32
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	mate-brightness-applet.png	\
-	mate-inhibit-applet.png	\
-	mate-power-manager.png		\
-	mate-power-statistics.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/32x32/status/Makefile.am b/data/icons/32x32/status/Makefile.am
deleted file mode 100644
index 17a68f1..0000000
--- a/data/icons/32x32/status/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 32x32
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-
-icons_DATA = 			        \
-	gpm-ac-adapter.png		\
-	gpm-brightness-lcd.png		\
-	gpm-brightness-kbd.png		\
-	gpm-brightness-lcd-disabled.png	\
-	gpm-brightness-kbd-disabled.png	\
-	gpm-brightness-lcd-invalid.png	\
-	gpm-brightness-kbd-invalid.png	\
-	gpm-inhibit.png			\
-	gpm-inhibit-invalid.png		\
-	gpm-keyboard-000.png		\
-	gpm-keyboard-020.png		\
-	gpm-keyboard-040.png		\
-	gpm-keyboard-060.png		\
-	gpm-keyboard-080.png		\
-	gpm-keyboard-100.png		\
-	gpm-phone-000.png		\
-	gpm-phone-020.png		\
-	gpm-phone-040.png		\
-	gpm-phone-060.png		\
-	gpm-phone-080.png		\
-	gpm-phone-100.png		\
-	gpm-mouse-000.png		\
-	gpm-mouse-020.png		\
-	gpm-mouse-040.png		\
-	gpm-mouse-060.png		\
-	gpm-mouse-080.png		\
-	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
-	gpm-ups-000.png			\
-	gpm-ups-020.png			\
-	gpm-ups-040.png			\
-	gpm-ups-060.png			\
-	gpm-ups-080.png			\
-	gpm-ups-100.png			\
-	gpm-ups-000-charging.png	\
-	gpm-ups-020-charging.png	\
-	gpm-ups-040-charging.png	\
-	gpm-ups-060-charging.png	\
-	gpm-ups-080-charging.png	\
-	gpm-ups-100-charging.png	\
-	gpm-ups-missing.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
deleted file mode 100644
index c755e92..0000000
--- a/data/icons/48x48/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = actions apps status
-
diff --git a/data/icons/48x48/actions/Makefile.am b/data/icons/48x48/actions/Makefile.am
deleted file mode 100644
index fd5eec3..0000000
--- a/data/icons/48x48/actions/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 48x48
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  \
-	gpm-hibernate.png	  \
-	gpm-suspend.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
deleted file mode 100644
index 380d0b3..0000000
--- a/data/icons/48x48/apps/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = 48x48
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	mate-brightness-applet.png	\
-	mate-inhibit-applet.png	\
-	mate-power-manager.png		\
-	mate-power-statistics.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/48x48/status/Makefile.am b/data/icons/48x48/status/Makefile.am
deleted file mode 100644
index e4d44fa..0000000
--- a/data/icons/48x48/status/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = 48x48
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-
-icons_DATA = 			        \
-	gpm-ac-adapter.png		\
-	gpm-brightness-lcd.png		\
-	gpm-brightness-kbd.png		\
-	gpm-brightness-lcd-disabled.png	\
-	gpm-brightness-kbd-disabled.png	\
-	gpm-brightness-lcd-invalid.png	\
-	gpm-brightness-kbd-invalid.png	\
-	gpm-monitor.png			\
-	gpm-inhibit.png			\
-	gpm-inhibit-invalid.png		\
-	gpm-keyboard-000.png		\
-	gpm-keyboard-020.png		\
-	gpm-keyboard-040.png		\
-	gpm-keyboard-060.png		\
-	gpm-keyboard-080.png		\
-	gpm-keyboard-100.png		\
-	gpm-phone-000.png		\
-	gpm-phone-020.png		\
-	gpm-phone-040.png		\
-	gpm-phone-060.png		\
-	gpm-phone-080.png		\
-	gpm-phone-100.png		\
-	gpm-mouse-000.png		\
-	gpm-mouse-020.png		\
-	gpm-mouse-040.png		\
-	gpm-mouse-060.png		\
-	gpm-mouse-080.png		\
-	gpm-mouse-100.png		\
-	gpm-battery-000.png		\
-	gpm-battery-020.png		\
-	gpm-battery-040.png		\
-	gpm-battery-060.png		\
-	gpm-battery-080.png		\
-	gpm-battery-100.png		\
-	gpm-battery-000-charging.png	\
-	gpm-battery-020-charging.png	\
-	gpm-battery-040-charging.png	\
-	gpm-battery-060-charging.png	\
-	gpm-battery-080-charging.png	\
-	gpm-battery-100-charging.png	\
-	gpm-battery-missing.png		\
-	gpm-battery-charged.png		\
-	gpm-battery-empty.png		\
-	gpm-ups-000.png			\
-	gpm-ups-020.png			\
-	gpm-ups-040.png			\
-	gpm-ups-060.png			\
-	gpm-ups-080.png			\
-	gpm-ups-100.png			\
-	gpm-ups-000-charging.png	\
-	gpm-ups-020-charging.png	\
-	gpm-ups-040-charging.png	\
-	gpm-ups-060-charging.png	\
-	gpm-ups-080-charging.png	\
-	gpm-ups-100-charging.png	\
-	gpm-ups-missing.png
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 17dca13..216fc60 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,4 +1,20 @@
-SUBDIRS = scalable 16x16 22x22 24x24 32x32 48x48
+actioniconsdir = $(pkgdatadir)/icons/hicolor
+appiconsdir = $(datadir)/icons/hicolor
+statusiconsdir = $(pkgdatadir)/icons/hicolor
+
+sizes = 16x16 22x22 24x24 32x32 48x48
+
+nobase_dist_actionicons_DATA = \
+	$(foreach size,$(sizes),$(wildcard $(size)/actions/*.png)) \
+	$(wildcard scalable/actions/*.svg)
+
+nobase_dist_appicons_DATA = \
+	$(foreach size,$(sizes),$(wildcard $(size)/apps/*.png)) \
+	$(wildcard scalable/apps/*.svg)
+
+nobase_dist_statusicons_DATA = \
+	$(foreach size,$(sizes),$(wildcard $(size)/status/*.png)) \
+	$(wildcard scalable/status/*.svg)
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(pkgdatadir)/icons/hicolor
 
@@ -12,4 +28,3 @@ update-icon-cache:
 		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
-
diff --git a/data/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
deleted file mode 100644
index c755e92..0000000
--- a/data/icons/scalable/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = actions apps status
-
diff --git a/data/icons/scalable/actions/Makefile.am b/data/icons/scalable/actions/Makefile.am
deleted file mode 100644
index 05a4445..0000000
--- a/data/icons/scalable/actions/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = actions
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  \
-	gpm-hibernate.svg	  \
-	gpm-suspend.svg
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am
deleted file mode 100644
index de12cd2..0000000
--- a/data/icons/scalable/apps/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-themedir = $(datadir)/icons/hicolor
-size = scalable
-context = apps
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-icons_DATA = 			  	\
-	mate-brightness-applet.svg	\
-	mate-inhibit-applet.svg	\
-	mate-power-manager.svg		\
-	mate-power-statistics.svg
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
diff --git a/data/icons/scalable/status/Makefile.am b/data/icons/scalable/status/Makefile.am
deleted file mode 100644
index cfba01e..0000000
--- a/data/icons/scalable/status/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-themedir = $(pkgdatadir)/icons/hicolor
-size = scalable
-context = status
-
-iconsdir = $(themedir)/$(size)/$(context)
-
-
-icons_DATA = 			        \
-	gpm-ac-adapter.svg		\
-	gpm-brightness-lcd.svg		\
-	gpm-brightness-kbd.svg		\
-	gpm-brightness-lcd-disabled.svg	\
-	gpm-brightness-kbd-disabled.svg	\
-	gpm-brightness-lcd-invalid.svg	\
-	gpm-brightness-kbd-invalid.svg	\
-	gpm-monitor.svg			\
-	gpm-inhibit.svg			\
-	gpm-inhibit-invalid.svg		\
-	gpm-keyboard-000.svg		\
-	gpm-keyboard-060.svg		\
-	gpm-keyboard-100.svg		\
-	gpm-phone-000.svg		\
-	gpm-phone-060.svg		\
-	gpm-phone-100.svg		\
-	gpm-mouse-000.svg		\
-	gpm-mouse-060.svg		\
-	gpm-mouse-100.svg		\
-	gpm-battery-000.svg		\
-	gpm-battery-020.svg		\
-	gpm-battery-040.svg		\
-	gpm-battery-060.svg		\
-	gpm-battery-080.svg		\
-	gpm-battery-100.svg		\
-	gpm-battery-000-charging.svg	\
-	gpm-battery-020-charging.svg	\
-	gpm-battery-040-charging.svg	\
-	gpm-battery-060-charging.svg	\
-	gpm-battery-080-charging.svg	\
-	gpm-battery-100-charging.svg	\
-	gpm-battery-missing.svg		\
-	gpm-battery-charged.svg		\
-	gpm-battery-empty.svg		\
-	gpm-ups-000.svg			\
-	gpm-ups-020.svg			\
-	gpm-ups-040.svg			\
-	gpm-ups-060.svg			\
-	gpm-ups-080.svg			\
-	gpm-ups-100.svg			\
-	gpm-ups-000-charging.svg	\
-	gpm-ups-020-charging.svg	\
-	gpm-ups-040-charging.svg	\
-	gpm-ups-060-charging.svg	\
-	gpm-ups-080-charging.svg	\
-	gpm-ups-100-charging.svg	\
-	gpm-ups-missing.svg
-
-noinst_DATA = 
-
-EXTRA_DIST =		\
-	$(icons_DATA)	\
-	$(noinst_DATA)
-