im.pidgin.elb.make: 7697ab7a2d1718ea16e52b2c03007343c5beb37e

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 7697ab7a2d1718ea16e52b2c03007343c5beb37e
Ancestor: 5268d1ef6569f9dfc7de14ad769186d6fe52a181
Author: nosnilmot at pidgin.im
Date: 2007-11-10T16:34:33
Branch: im.pidgin.elb.make

Deleted entries:
        pidgin/pixmaps/icons/16/Makefile.am
        pidgin/pixmaps/icons/22/Makefile.am
        pidgin/pixmaps/icons/24/Makefile.am
        pidgin/pixmaps/icons/32/Makefile.am
        pidgin/pixmaps/icons/48/Makefile.am
Renamed entries:
        pidgin/pixmaps/icons/16 to pidgin/pixmaps/icons/hicolor/16x16/apps
        pidgin/pixmaps/icons/22 to pidgin/pixmaps/icons/hicolor/22x22/apps
        pidgin/pixmaps/icons/24 to pidgin/pixmaps/icons/hicolor/24x24/apps
        pidgin/pixmaps/icons/32 to pidgin/pixmaps/icons/hicolor/32x32/apps
        pidgin/pixmaps/icons/48 to pidgin/pixmaps/icons/hicolor/48x48/apps
Added directories:
        pidgin/pixmaps/icons/hicolor
        pidgin/pixmaps/icons/hicolor/16x16
        pidgin/pixmaps/icons/hicolor/22x22
        pidgin/pixmaps/icons/hicolor/24x24
        pidgin/pixmaps/icons/hicolor/32x32
        pidgin/pixmaps/icons/hicolor/48x48
Modified files:
        configure.ac pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/Makefile.mingw

ChangeLog: 

Consolidation of icons Makefiles

-------------- next part --------------
============================================================
--- configure.ac	7c380ddb4a067a25b17fb11a0b94e8064ff9b79f
+++ configure.ac	97b47128fe6c95a900816af9be23db8e56d920e9
@@ -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
============================================================
--- pidgin/pixmaps/Makefile.am	1f1671259039404c70c9fe5050b6315545568ca9
+++ pidgin/pixmaps/Makefile.am	78b4732370810d6efb27acd01a970cb1e5b1af17
@@ -1,7 +1,7 @@ pidginpixmapdir = $(datadir)/pixmaps/pid
 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,20 +323,30 @@ ICONS_16_SCALABLE = \
 		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 \
 		protocols/22/scalable/bonjour.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)
============================================================
--- pidgin/pixmaps/Makefile.mingw	3fd811841c326ec9cf3fe186d277bf1fd959cafe
+++ pidgin/pixmaps/Makefile.mingw	ab727d98a2b99d35ed924407b5253316f3f5c171
@@ -15,9 +15,7 @@ install:
 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 \