Consolidation of icons Makefileselb.make

18 files changed, 23 insertions, 44 deletions

diff --git a/configure.ac b/configure.ac
index 6ab6609f13..f5908f8fd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2208,11 +2208,6 @@ AC_OUTPUT([Makefile
 		   pidgin/pixmaps/buddy_icons/qq/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
-		   pidgin/pixmaps/icons/16/Makefile
-		   pidgin/pixmaps/icons/22/Makefile
-		   pidgin/pixmaps/icons/24/Makefile
-		   pidgin/pixmaps/icons/32/Makefile
-		   pidgin/pixmaps/icons/48/Makefile
 		   pidgin/plugins/Makefile
 		   pidgin/plugins/cap/Makefile
 		   pidgin/plugins/gestures/Makefile
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
index ade830782c..1c27947bbd 100644
--- a/pidgin/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
@@ -1,7 +1,7 @@
 pidginpixmapdir = $(datadir)/pixmaps/pidgin
+pidginiconsdir = $(datadir)
 
-SUBDIRS = buddy_icons/qq emotes/default/24 emotes/none \
-          icons/16 icons/22 icons/24 icons/32 icons/48
+SUBDIRS = buddy_icons/qq emotes/default/24 emotes/none
 
 MAKEFILE_MINGW = \
 		buddy_icons/qq/Makefile.mingw \
@@ -323,19 +323,29 @@ PROTOCOLS_16 = \
 		protocols/16/zephyr.png
 
 ICONS_16_SCALABLE = \
-		icons/16/scalable/pidgin.svg
+		icons/hicolor/16x16/apps/scalable/pidgin.svg
+
+ICONS_16 = icons/hicolor/16x16/apps/pidgin.png
 
 ICONS_22_SCALABLE = \
-		icons/22/scalable/pidgin.svg
+		icons/hicolor/22x22/apps/scalable/pidgin.svg
+
+ICONS_22 = icons/hicolor/22x22/apps/pidgin.png
 
 ICONS_24_SCALABLE = \
-		icons/24/scalable/pidgin.svg
+		icons/hicolor/24x24/apps/scalable/pidgin.svg
+
+ICONS_24 = icons/hicolor/24x24/apps/pidgin.png
 
 ICONS_32_SCALABLE = \
-		icons/32/scalable/pidgin.svg
+		icons/hicolor/32x32/apps/scalable/pidgin.svg
+
+ICONS_32 = icons/hicolor/32x32/apps/pidgin.png
 
 ICONS_48_SCALABLE = \
-		icons/48/scalable/pidgin.svg
+		icons/hicolor/48x48/apps/scalable/pidgin.svg
+
+ICONS_48 = icons/hicolor/48x48/apps/pidgin.png
 
 PROTOCOLS_22_SCALABLE = \
 		protocols/22/scalable/aim.svg \
@@ -691,3 +701,9 @@ nobase_dist_pidginpixmap_DATA = \
 		$(TRAY_32) \
 		$(TRAY_48)
 
+nobase_dist_pidginicons_DATA = \
+		$(ICONS_16) \
+		$(ICONS_22) \
+		$(ICONS_24) \
+		$(ICONS_32) \
+		$(ICONS_48)
diff --git a/pidgin/pixmaps/Makefile.mingw b/pidgin/pixmaps/Makefile.mingw
index 3722f70ac7..49e07c9ffd 100644
--- a/pidgin/pixmaps/Makefile.mingw
+++ b/pidgin/pixmaps/Makefile.mingw
@@ -15,9 +15,7 @@ include ./Makefile.am
 install:
 	if test '$(SUBDIRS)'; then \
 	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if [[ "$$subdir" != icons/* ]]; then \
 	    $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1 ;\
-	  fi \
 	  done; \
 	fi;
 	if test '$(nobase_dist_pidginpixmap_DATA)'; then \
diff --git a/pidgin/pixmaps/icons/16/Makefile.am b/pidgin/pixmaps/icons/16/Makefile.am
deleted file mode 100644
index aa3731fb0f..0000000000
--- a/pidgin/pixmaps/icons/16/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = pidgin.png 
-
-pidginiconspixdir = $(datadir)/icons/hicolor/16x16/apps
-
-pidginiconspix_DATA = $(EXTRA_DIST)
-
diff --git a/pidgin/pixmaps/icons/22/Makefile.am b/pidgin/pixmaps/icons/22/Makefile.am
deleted file mode 100644
index 6fc9de4d98..0000000000
--- a/pidgin/pixmaps/icons/22/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = pidgin.png 
-
-pidginiconspixdir = $(datadir)/icons/hicolor/22x22/apps
-
-pidginiconspix_DATA = $(EXTRA_DIST)
-
diff --git a/pidgin/pixmaps/icons/24/Makefile.am b/pidgin/pixmaps/icons/24/Makefile.am
deleted file mode 100644
index 8a11cbf5d3..0000000000
--- a/pidgin/pixmaps/icons/24/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = pidgin.png 
-
-pidginiconspixdir = $(datadir)/icons/hicolor/24x24/apps
-
-pidginiconspix_DATA = $(EXTRA_DIST)
-
diff --git a/pidgin/pixmaps/icons/32/Makefile.am b/pidgin/pixmaps/icons/32/Makefile.am
deleted file mode 100644
index 5e6b914467..0000000000
--- a/pidgin/pixmaps/icons/32/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = pidgin.png 
-
-pidginiconspixdir = $(datadir)/icons/hicolor/32x32/apps
-
-pidginiconspix_DATA = $(EXTRA_DIST)
-
diff --git a/pidgin/pixmaps/icons/48/Makefile.am b/pidgin/pixmaps/icons/48/Makefile.am
deleted file mode 100644
index a2d2aa5250..0000000000
--- a/pidgin/pixmaps/icons/48/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_DIST = pidgin.png 
-
-pidginiconspixdir = $(datadir)/icons/hicolor/48x48/apps
-
-pidginiconspix_DATA = $(EXTRA_DIST)
-
diff --git a/pidgin/pixmaps/icons/16/pidgin.png b/pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png
index 742f3c2c3a..742f3c2c3a 100644
--- a/pidgin/pixmaps/icons/16/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/16/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg
index 1043821fec..1043821fec 100644
--- a/pidgin/pixmaps/icons/16/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg
diff --git a/pidgin/pixmaps/icons/22/pidgin.png b/pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png
index c91d8413d1..c91d8413d1 100644
--- a/pidgin/pixmaps/icons/22/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/22/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg
index 9169426a04..9169426a04 100644
--- a/pidgin/pixmaps/icons/22/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg
diff --git a/pidgin/pixmaps/icons/24/pidgin.png b/pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png
index 6011b87dd8..6011b87dd8 100644
--- a/pidgin/pixmaps/icons/24/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/24/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg
index 2eb95bcb5e..2eb95bcb5e 100644
--- a/pidgin/pixmaps/icons/24/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg
diff --git a/pidgin/pixmaps/icons/32/pidgin.png b/pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png
index b9ea80b4f3..b9ea80b4f3 100644
--- a/pidgin/pixmaps/icons/32/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/32/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg
index f83c5a4808..f83c5a4808 100644
--- a/pidgin/pixmaps/icons/32/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg
diff --git a/pidgin/pixmaps/icons/48/pidgin.png b/pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png
index ff43d9010b..ff43d9010b 100644
--- a/pidgin/pixmaps/icons/48/pidgin.png
+++ b/pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png
diff --git a/pidgin/pixmaps/icons/48/scalable/pidgin.svg b/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg
index e877ac35d6..e877ac35d6 100644
--- a/pidgin/pixmaps/icons/48/scalable/pidgin.svg
+++ b/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg