im.pidgin.elb.make: 7422b9a549f752c05cc75f0c8e56fdd2bced034a

nosnilmot at pidgin.im nosnilmot at pidgin.im
Tue Nov 6 12:16:15 EST 2007


-----------------------------------------------------------------
Revision: 7422b9a549f752c05cc75f0c8e56fdd2bced034a
Ancestor: 9711119df29a0928ae061bc0e4d34d750db51f23
Author: nosnilmot at pidgin.im
Date: 2007-11-06T17:13:21
Branch: im.pidgin.elb.make

Deleted entries:
        pidgin/pixmaps/dialogs/16/Makefile.am
        pidgin/pixmaps/dialogs/16/Makefile.mingw
        pidgin/pixmaps/dialogs/64/Makefile.am
        pidgin/pixmaps/dialogs/64/Makefile.mingw
        pidgin/pixmaps/emblems/16/Makefile.am
        pidgin/pixmaps/emblems/16/Makefile.mingw
        pidgin/pixmaps/emotes/default/Makefile.mingw
        pidgin/pixmaps/protocols/16/Makefile.am
        pidgin/pixmaps/protocols/16/Makefile.mingw
        pidgin/pixmaps/protocols/22/Makefile.am
        pidgin/pixmaps/protocols/22/Makefile.mingw
        pidgin/pixmaps/protocols/48/Makefile.am
        pidgin/pixmaps/protocols/48/Makefile.mingw
        pidgin/pixmaps/status/11/Makefile.am
        pidgin/pixmaps/status/11/Makefile.mingw
        pidgin/pixmaps/status/11/rtl/Makefile.am
        pidgin/pixmaps/status/11/rtl/Makefile.mingw
        pidgin/pixmaps/status/16/Makefile.am
        pidgin/pixmaps/status/16/Makefile.mingw
        pidgin/pixmaps/status/16/rtl/Makefile.am
        pidgin/pixmaps/status/16/rtl/Makefile.mingw
        pidgin/pixmaps/status/22/Makefile.am
        pidgin/pixmaps/status/22/Makefile.mingw
        pidgin/pixmaps/status/22/rtl/Makefile.am
        pidgin/pixmaps/status/22/rtl/Makefile.mingw
        pidgin/pixmaps/status/32/Makefile.am
        pidgin/pixmaps/status/32/Makefile.mingw
        pidgin/pixmaps/status/32/rtl/Makefile.am
        pidgin/pixmaps/status/32/rtl/Makefile.mingw
        pidgin/pixmaps/status/48/Makefile.am
        pidgin/pixmaps/status/48/Makefile.mingw
        pidgin/pixmaps/status/48/rtl/Makefile.am
        pidgin/pixmaps/status/48/rtl/Makefile.mingw
        pidgin/pixmaps/toolbar/16/Makefile.am
        pidgin/pixmaps/toolbar/16/Makefile.mingw
        pidgin/pixmaps/toolbar/22/Makefile.am
        pidgin/pixmaps/toolbar/22/Makefile.mingw
        pidgin/pixmaps/tray/16/Makefile.am
        pidgin/pixmaps/tray/16/Makefile.mingw
        pidgin/pixmaps/tray/16/scalable/Makefile.am
        pidgin/pixmaps/tray/22/Makefile.am
        pidgin/pixmaps/tray/22/Makefile.mingw
        pidgin/pixmaps/tray/22/scalable/Makefile.am
        pidgin/pixmaps/tray/32/Makefile.am
        pidgin/pixmaps/tray/32/Makefile.mingw
        pidgin/pixmaps/tray/48/Makefile.am
        pidgin/pixmaps/tray/48/Makefile.mingw
Modified files:
        configure.ac pidgin/pixmaps/Makefile.am

ChangeLog: 

More pixmaps Makefile consolidation


-------------- next part --------------
============================================================
--- configure.ac	04fa2ed04348a0a3fd118a1f3626f03684302aa2
+++ configure.ac	6c878e2ecf1ecf87a63d8f3b52b56795be257b48
@@ -2179,9 +2179,6 @@ AC_OUTPUT([Makefile
 		   pidgin/pidgin-uninstalled.pc
 		   pidgin/pixmaps/Makefile
 		   pidgin/pixmaps/buddy_icons/qq/Makefile
-		   pidgin/pixmaps/dialogs/16/Makefile
-		   pidgin/pixmaps/dialogs/64/Makefile
-		   pidgin/pixmaps/emblems/16/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
 		   pidgin/pixmaps/icons/16/Makefile
@@ -2189,25 +2186,6 @@ AC_OUTPUT([Makefile
 		   pidgin/pixmaps/icons/24/Makefile
 		   pidgin/pixmaps/icons/32/Makefile
 		   pidgin/pixmaps/icons/48/Makefile
-		   pidgin/pixmaps/protocols/16/Makefile
-		   pidgin/pixmaps/protocols/22/Makefile
-		   pidgin/pixmaps/protocols/48/Makefile
-		   pidgin/pixmaps/status/11/Makefile
-		   pidgin/pixmaps/status/11/rtl/Makefile
-		   pidgin/pixmaps/status/16/Makefile
-		   pidgin/pixmaps/status/16/rtl/Makefile
-		   pidgin/pixmaps/status/22/Makefile
-		   pidgin/pixmaps/status/22/rtl/Makefile
-		   pidgin/pixmaps/status/32/Makefile
-		   pidgin/pixmaps/status/32/rtl/Makefile
-		   pidgin/pixmaps/status/48/Makefile
-		   pidgin/pixmaps/status/48/rtl/Makefile
-		   pidgin/pixmaps/toolbar/16/Makefile
-		   pidgin/pixmaps/toolbar/22/Makefile
-		   pidgin/pixmaps/tray/16/Makefile
-		   pidgin/pixmaps/tray/22/Makefile
-		   pidgin/pixmaps/tray/32/Makefile
-		   pidgin/pixmaps/tray/48/Makefile
 		   pidgin/plugins/Makefile
 		   pidgin/plugins/cap/Makefile
 		   pidgin/plugins/gestures/Makefile
============================================================
--- pidgin/pixmaps/Makefile.am	c95dc3ee2c67112c5db3afe8bd9f6b8fb2182ff6
+++ pidgin/pixmaps/Makefile.am	c37c9a97b485ea63aaf6ece91735b81c68c98668
@@ -1,42 +1,16 @@ pidginpixmapdir = $(datadir)/pixmaps/pid
 pidginpixmapdir = $(datadir)/pixmaps/pidgin
 
-SUBDIRS = buddy_icons/qq dialogs/16 dialogs/64 emblems/16 \
-          emotes/default/24 emotes/none \
-          icons/16 icons/22 icons/24 icons/32 icons/48 \
-          protocols/16 protocols/22 protocols/48 \
-          status/11 status/16 status/22 status/32 status/48 \
-          toolbar/16 toolbar/22 tray/16 tray/22 tray/32 tray/48
+SUBDIRS = buddy_icons/qq emotes/default/24 emotes/none \
+          icons/16 icons/22 icons/24 icons/32 icons/48
 
 MAKEFILE_MINGW = \
 		buddy_icons/qq/Makefile.mingw \
-		dialogs/16/Makefile.mingw \
-		dialogs/64/Makefile.mingw \
+		emotes/default/24/Makefile.mingw \
+		emotes/none/Makefile.mingw \
 		icons/16/Makefile.mingw \
 		icons/24/Makefile.mingw \
 		icons/32/Makefile.mingw \
-		icons/48/Makefile.mingw \
-		emotes/default/Makefile.mingw \
-		emotes/default/24/Makefile.mingw \
-		emotes/none/Makefile.mingw \
-		emblems/16/Makefile.mingw \
-		protocols/22/Makefile.mingw \
-		protocols/48/Makefile.mingw \
-		status/11/Makefile.mingw \
-		status/11/rtl/Makefile.mingw \
-		status/16/Makefile.mingw \
-		status/16/rtl/Makefile.mingw \
-		status/22/Makefile.mingw \
-		status/22/rtl/Makefile.mingw \
-		status/32/Makefile.mingw \
-		status/32/rtl/Makefile.mingw \
-		status/48/Makefile.mingw \
-		status/48/rtl/Makefile.mingw \
-		toolbar/16/Makefile.mingw \
-		toolbar/22/Makefile.mingw \
-		tray/16/Makefile.mingw \
-		tray/22/Makefile.mingw \
-		tray/32/Makefile.mingw \
-		tray/48/Makefile.mingw
+		icons/48/Makefile.mingw
 
 ANIMATIONS_16 = \
 		animations/16/connect0.png \
@@ -60,6 +34,13 @@ DIALOGS_16_SCALABLE = \
 		dialogs/16/scalable/info.svg \
 		dialogs/16/scalable/mail.svg
 
+DIALOGS_16 = \
+		dialogs/16/auth.png \
+		dialogs/16/error.png \
+		dialogs/16/info.png \
+		dialogs/16/mail.png \
+		dialogs/16/question.png
+
 DIALOGS_64_SCALABLE = \
 		dialogs/64/scalable/auth.svg \
 		dialogs/64/scalable/cool.svg \
@@ -69,6 +50,16 @@ DIALOGS_64_SCALABLE = \
 		dialogs/64/scalable/question.svg \
 		dialogs/64/scalable/warning.svg
 
+DIALOGS_64 = \
+		dialogs/64/auth.png \
+		dialogs/64/cool.png \
+		dialogs/64/dialog.png \
+		dialogs/64/error.png \
+		dialogs/64/info.png \
+		dialogs/64/mail.png \
+		dialogs/64/question.png \
+		dialogs/64/warning.png
+
 EMBLEMS_16_SCALABLE = \
 		emblems/16/scalable/aol-client.svg \
 		emblems/16/scalable/blocked.svg \
@@ -87,6 +78,29 @@ EMBLEMS_16_SCALABLE = \
 		emblems/16/scalable/video.svg \
 		emblems/16/scalable/voice.svg
 
+EMBLEMS_16 = \
+		emblems/16/aol-client.png \
+		emblems/16/birthday.png \
+		emblems/16/blocked.png \
+		emblems/16/bot.png \
+		emblems/16/external.png \
+		emblems/16/female.png \
+		emblems/16/founder.png \
+		emblems/16/free-for-chat.png \
+		emblems/16/game.png \
+		emblems/16/half-operator.png \
+		emblems/16/hiptop.png \
+		emblems/16/male.png \
+		emblems/16/mobile.png \
+		emblems/16/music.png \
+		emblems/16/not-authorized.png \
+		emblems/16/operator.png \
+		emblems/16/qq-member.png \
+		emblems/16/secure.png \
+		emblems/16/unavailable.png \
+		emblems/16/video.png \
+		emblems/16/voice.png
+
 EMOTES_DEFAULT_24_SCALABLE = \
 		emotes/default/24/scalable/act-up.svg \
 		emotes/default/24/scalable/airplane.svg \
@@ -294,6 +308,24 @@ PROTOCOLS_16_SCALABLE = \
 		protocols/16/scalable/yahoo.svg \
 		protocols/16/scalable/zephyr.svg
 
+PROTOCOLS_16 = \
+		protocols/16/aim.png \
+		protocols/16/bonjour.png \
+		protocols/16/gadu-gadu.png \
+		protocols/16/google-talk.png \
+		protocols/16/novell.png \
+		protocols/16/icq.png \
+		protocols/16/irc.png \
+		protocols/16/jabber.png \
+		protocols/16/meanwhile.png \
+		protocols/16/msn.png \
+		protocols/16/myspace.png \
+		protocols/16/qq.png \
+		protocols/16/silc.png \
+		protocols/16/simple.png \
+		protocols/16/yahoo.png \
+		protocols/16/zephyr.png
+
 ICONS_16_SCALABLE = \
 		icons/16/scalable/pidgin.svg
 
@@ -325,6 +357,24 @@ PROTOCOLS_22_SCALABLE = \
 		protocols/22/scalable/yahoo.svg \
 		protocols/22/scalable/zephyr.svg
 
+PROTOCOLS_22 = \
+		protocols/22/aim.png \
+		protocols/22/bonjour.png \
+		protocols/22/gadu-gadu.png \
+		protocols/22/google-talk.png \
+		protocols/22/novell.png \
+		protocols/22/icq.png \
+		protocols/22/irc.png \
+		protocols/22/jabber.png \
+		protocols/22/meanwhile.png \
+		protocols/22/msn.png \
+		protocols/22/myspace.png \
+		protocols/22/qq.png \
+		protocols/22/silc.png \
+		protocols/22/simple.png \
+		protocols/22/yahoo.png \
+		protocols/22/zephyr.png
+
 PROTOCOLS_48_SCALABLE = \
 		protocols/48/scalable/aim.svg \
 		protocols/48/scalable/bonjour.svg \
@@ -342,6 +392,23 @@ PROTOCOLS_48_SCALABLE = \
 		protocols/48/scalable/yahoo.svg \
 		protocols/48/scalable/zephyr.svg
 
+PROTOCOLS_48 = \
+		protocols/48/aim.png \
+		protocols/48/bonjour.png \
+		protocols/48/gadu-gadu.png \
+		protocols/48/novell.png \
+		protocols/48/icq.png \
+		protocols/48/irc.png \
+		protocols/48/jabber.png \
+		protocols/48/meanwhile.png \
+		protocols/48/msn.png \
+		protocols/48/myspace.png \
+		protocols/48/qq.png \
+		protocols/48/silc.png \
+		protocols/48/simple.png \
+		protocols/48/yahoo.png \
+		protocols/48/zephyr.png
+
 STATUS_11_SCALABLE = \
 		status/11/scalable/available.svg \
 		status/11/scalable/away.svg \
@@ -352,6 +419,21 @@ STATUS_11_SCALABLE = \
 		status/11/scalable/offline.svg \
 		status/11/scalable/person.svg
 
+STATUS_11 = \
+		status/11/available.png \
+		status/11/away.png \
+		status/11/busy.png \
+		status/11/chat.png \
+		status/11/extended-away.png \
+		status/11/invisible.png \
+		status/11/log-in.png \
+		status/11/log-out.png \
+		status/11/offline.png \
+		status/11/person.png
+
+STATUS_11_RTL = \
+		status/11/rtl/extended-away.png
+
 STATUS_16_SCALABLE = \
 		status/16/scalable/available.svg \
 		status/16/scalable/away.svg \
@@ -364,6 +446,23 @@ STATUS_16_SCALABLE = \
 		status/16/scalable/offline.svg \
 		status/16/scalable/person.svg
 
+STATUS_16 = \
+		status/16/available.png \
+		status/16/away.png \
+		status/16/busy.png \
+		status/16/chat.png \
+		status/16/extended-away.png \
+		status/16/invisible.png \
+		status/16/log-in.png \
+		status/16/log-out.png \
+		status/16/offline.png \
+		status/16/person.png
+
+STATUS_16_RTL = \
+		status/16/rtl/extended-away.png \
+		status/16/rtl/log-in.png \
+		status/16/rtl/log-out.png
+
 STATUS_22_SCALABLE = \
 		status/22/scalable/available.svg \
 		status/22/scalable/away.svg \
@@ -375,6 +474,23 @@ STATUS_22_SCALABLE = \
 		status/22/scalable/offline.svg \
 		status/22/scalable/person.svg
 
+STATUS_22 = \
+		status/22/available.png \
+		status/22/away.png \
+		status/22/busy.png \
+		status/22/chat.png \
+		status/22/extended-away.png \
+		status/22/invisible.png \
+		status/22/log-in.png \
+		status/22/log-out.png \
+		status/22/offline.png \
+		status/22/person.png
+
+STATUS_22_RTL = \
+		status/22/rtl/extended-away.png \
+		status/22/rtl/log-in.png \
+		status/22/rtl/log-out.png
+
 STATUS_32_SCALABLE = \
 		status/32/scalable/available.svg \
 		status/32/scalable/away.svg \
@@ -386,6 +502,37 @@ STATUS_32_SCALABLE = \
 		status/32/scalable/offline.svg \
 		status/32/scalable/person.svg
 
+STATUS_32 = \
+		status/32/available.png \
+		status/32/away.png \
+		status/32/busy.png \
+		status/32/chat.png \
+		status/32/extended-away.png \
+		status/32/invisible.png \
+		status/32/log-in.png \
+		status/32/log-out.png \
+		status/32/offline.png \
+		status/32/person.png
+
+STATUS_32_RTL = \
+		status/32/rtl/extended-away.png \
+		status/32/rtl/log-in.png \
+		status/32/rtl/log-out.png
+
+STATUS_48 = \
+		status/48/available.png \
+		status/48/away.png \
+		status/48/busy.png \
+		status/48/chat.png \
+		status/48/extended-away.png \
+		status/48/log-in.png \
+		status/48/log-out.png \
+		status/48/offline.png \
+		status/48/person.png
+
+STATUS_48_RTL = \
+		status/48/rtl/extended-away.png
+
 TOOLBAR_11 = \
 		toolbar/11/message-new.png
 
@@ -396,9 +543,27 @@ TOOLBAR_16_SCALABLE = \
 		toolbar/16/scalable/font-size-down.svg \
 		toolbar/16/scalable/font-size-up.svg
 
+TOOLBAR_16 = \
+		toolbar/16/change-bgcolor.png \
+		toolbar/16/change-fgcolor.png \
+		toolbar/16/emote-select.png \
+		toolbar/16/font-face.png \
+		toolbar/16/font-size-down.png \
+		toolbar/16/font-size-up.png \
+		toolbar/16/insert.png \
+		toolbar/16/insert-image.png \
+		toolbar/16/insert-link.png \
+		toolbar/16/message-new.png \
+		toolbar/16/plugins.png \
+		toolbar/16/send-file.png \
+		toolbar/16/unblock.png
+
 TOOLBAR_22_SCALABLE = \
 		toolbar/22/scalable/select-avatar.svg
 
+TOOLBAR_22 = \
+		toolbar/22/select-avatar.png
+
 TRAY_16_SCALABLE = \
 		tray/16/scalable/tray-away.svg \
 		tray/16/scalable/tray-busy.svg \
@@ -409,9 +574,61 @@ TRAY_16_SCALABLE = \
 		tray/16/scalable/tray-offline.svg \
 		tray/16/scalable/tray-online.svg
 
+TRAY_16_ICO = \
+		tray/16/available_4bit.ico \
+		tray/16/away_4bit.ico \
+		tray/16/busy_4bit.ico \
+		tray/16/connecting_4bit.ico \
+		tray/16/extended-away_4bit.ico \
+		tray/16/invisible_4bit.ico \
+		tray/16/message_4bit.ico \
+		tray/16/offline_4bit.ico
+
+TRAY_16 = \
+		tray/16/tray-away.png \
+		tray/16/tray-busy.png \
+		tray/16/tray-invisible.png \
+		tray/16/tray-connecting.png \
+		tray/16/tray-extended-away.png \
+		tray/16/tray-message.png \
+		tray/16/tray-new-im.png \
+		tray/16/tray-offline.png \
+		tray/16/tray-online.png
+
 TRAY_22_SCALABLE = \
 		tray/22/scalable/tray-invisible.svg
 
+TRAY_22 = \
+		tray/22/tray-away.png \
+		tray/22/tray-busy.png \
+		tray/22/tray-connecting.png \
+		tray/22/tray-extended-away.png \
+		tray/22/tray-invisible.png \
+		tray/22/tray-message.png \
+		tray/22/tray-new-im.png \
+		tray/22/tray-offline.png \
+		tray/22/tray-online.png
+
+TRAY_32 = \
+		tray/32/tray-away.png \
+		tray/32/tray-busy.png \
+		tray/32/tray-connecting.png \
+		tray/32/tray-extended-away.png \
+		tray/32/tray-invisible.png \
+		tray/32/tray-new-im.png \
+		tray/32/tray-offline.png \
+		tray/32/tray-online.png
+
+TRAY_48 = \
+		tray/48/tray-away.png \
+		tray/48/tray-busy.png \
+		tray/48/tray-connecting.png \
+		tray/48/tray-extended-away.png \
+		tray/48/tray-invisible.png \
+		tray/48/tray-new-im.png \
+		tray/48/tray-offline.png \
+		tray/48/tray-online.png
+
 EXTRA_DIST = \
 		edit.png			\
 		info.png			\
@@ -443,6 +660,7 @@ EXTRA_DIST = \
 		$(TOOLBAR_11)		\
 		$(TOOLBAR_16_SCALABLE)	\
 		$(TOOLBAR_22_SCALABLE)	\
+		$(TRAY_16_ICO) \
 		$(TRAY_16_SCALABLE)	\
 		$(TRAY_22_SCALABLE)
 
@@ -452,4 +670,28 @@ pidgindistpix_DATA = logo.png arrow-down
 pidgindistpixdir = $(datadir)/pixmaps/pidgin
 pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm
 
+nobase_dist_pidginpixmap_DATA = \
+		$(ANIMATIONS_16) \
+		$(DIALOGS_16) \
+		$(DIALOGS_64) \
+		$(EMBLEMS_16) \
+		$(PROTOCOLS_16) \
+		$(PROTOCOLS_22) \
+		$(PROTOCOLS_48) \
+		$(STATUS_11) \
+		$(STATUS_11_RTL) \
+		$(STATUS_16) \
+		$(STATUS_16_RTL) \
+		$(STATUS_22) \
+		$(STATUS_22_RTL) \
+		$(STATUS_32) \
+		$(STATUS_32_RTL) \
+		$(STATUS_48) \
+		$(STATUS_48_RTL) \
+		$(TOOLBAR_16) \
+		$(TOOLBAR_22) \
+		$(TRAY_16) \
+		$(TRAY_22) \
+		$(TRAY_32) \
+		$(TRAY_48)
+
-nobase_dist_pidginpixmap_DATA = $(ANIMATIONS_16)


More information about the Commits mailing list