# HG changeset patch # User Stu Tomlinson # Date 1194712473 0 # Node ID 708b51ddddc4eb7081ca652e34dad1c33d6cb799 # Parent abbf74f4732bd9a5be8ff206e713306523fb2eb0 Consolidation of icons Makefiles diff -r abbf74f4732b -r 708b51ddddc4 configure.ac --- a/configure.ac Sat Nov 10 16:17:54 2007 +0000 +++ b/configure.ac Sat Nov 10 16:34:33 2007 +0000 @@ -2208,11 +2208,6 @@ 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 -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/Makefile.am --- a/pidgin/pixmaps/Makefile.am Sat Nov 10 16:17:54 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Sat Nov 10 16:34:33 2007 +0000 @@ -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/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 @@ $(TRAY_32) \ $(TRAY_48) +nobase_dist_pidginicons_DATA = \ + $(ICONS_16) \ + $(ICONS_22) \ + $(ICONS_24) \ + $(ICONS_32) \ + $(ICONS_48) diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/Makefile.mingw --- a/pidgin/pixmaps/Makefile.mingw Sat Nov 10 16:17:54 2007 +0000 +++ b/pidgin/pixmaps/Makefile.mingw Sat Nov 10 16:34:33 2007 +0000 @@ -15,9 +15,7 @@ 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 -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/16/Makefile.am --- a/pidgin/pixmaps/icons/16/Makefile.am Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/16x16/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/16/pidgin.png Binary file pidgin/pixmaps/icons/16/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/16/scalable/pidgin.svg --- a/pidgin/pixmaps/icons/16/scalable/pidgin.svg Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,784 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/22/Makefile.am --- a/pidgin/pixmaps/icons/22/Makefile.am Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/22x22/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/22/pidgin.png Binary file pidgin/pixmaps/icons/22/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/22/scalable/pidgin.svg --- a/pidgin/pixmaps/icons/22/scalable/pidgin.svg Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,591 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/24/Makefile.am --- a/pidgin/pixmaps/icons/24/Makefile.am Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/24x24/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/24/pidgin.png Binary file pidgin/pixmaps/icons/24/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/24/scalable/pidgin.svg --- a/pidgin/pixmaps/icons/24/scalable/pidgin.svg Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,589 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/32/Makefile.am --- a/pidgin/pixmaps/icons/32/Makefile.am Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/32x32/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/32/pidgin.png Binary file pidgin/pixmaps/icons/32/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/32/scalable/pidgin.svg --- a/pidgin/pixmaps/icons/32/scalable/pidgin.svg Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,489 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/48/Makefile.am --- a/pidgin/pixmaps/icons/48/Makefile.am Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -EXTRA_DIST = pidgin.png - -pidginiconspixdir = $(datadir)/icons/hicolor/48x48/apps - -pidginiconspix_DATA = $(EXTRA_DIST) - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/48/pidgin.png Binary file pidgin/pixmaps/icons/48/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/48/scalable/pidgin.svg --- a/pidgin/pixmaps/icons/48/scalable/pidgin.svg Sat Nov 10 16:17:54 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,460 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png Binary file pidgin/pixmaps/icons/hicolor/16x16/apps/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/hicolor/16x16/apps/scalable/pidgin.svg Sat Nov 10 16:34:33 2007 +0000 @@ -0,0 +1,784 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png Binary file pidgin/pixmaps/icons/hicolor/22x22/apps/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/hicolor/22x22/apps/scalable/pidgin.svg Sat Nov 10 16:34:33 2007 +0000 @@ -0,0 +1,591 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png Binary file pidgin/pixmaps/icons/hicolor/24x24/apps/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/hicolor/24x24/apps/scalable/pidgin.svg Sat Nov 10 16:34:33 2007 +0000 @@ -0,0 +1,589 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png Binary file pidgin/pixmaps/icons/hicolor/32x32/apps/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/hicolor/32x32/apps/scalable/pidgin.svg Sat Nov 10 16:34:33 2007 +0000 @@ -0,0 +1,489 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png Binary file pidgin/pixmaps/icons/hicolor/48x48/apps/pidgin.png has changed diff -r abbf74f4732b -r 708b51ddddc4 pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/icons/hicolor/48x48/apps/scalable/pidgin.svg Sat Nov 10 16:34:33 2007 +0000 @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + +