Mercurial > pidgin.yaz

--- a/configure.ac	Sun Nov 04 04:41:09 2007 +0000
+++ b/configure.ac	Sun Nov 04 18:32:14 2007 +0000
@@ -2178,66 +2178,34 @@
 		   pidgin/pidgin.pc
 		   pidgin/pidgin-uninstalled.pc
 		   pidgin/pixmaps/Makefile
-		   pidgin/pixmaps/animations/Makefile
-		   pidgin/pixmaps/animations/16/Makefile
-		   pidgin/pixmaps/buddy_icons/Makefile
 		   pidgin/pixmaps/buddy_icons/qq/Makefile
-		   pidgin/pixmaps/dialogs/Makefile
 		   pidgin/pixmaps/dialogs/16/Makefile
-		   pidgin/pixmaps/dialogs/16/scalable/Makefile
 		   pidgin/pixmaps/dialogs/64/Makefile
-		   pidgin/pixmaps/dialogs/64/scalable/Makefile
-		   pidgin/pixmaps/emblems/Makefile
 		   pidgin/pixmaps/emblems/16/Makefile
-		   pidgin/pixmaps/emblems/16/scalable/Makefile
-		   pidgin/pixmaps/emotes/Makefile
-		   pidgin/pixmaps/emotes/default/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
-		   pidgin/pixmaps/emotes/default/24/scalable/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
-		   pidgin/pixmaps/icons/Makefile
 		   pidgin/pixmaps/icons/16/Makefile
-		   pidgin/pixmaps/icons/16/scalable/Makefile
 		   pidgin/pixmaps/icons/22/Makefile
-		   pidgin/pixmaps/icons/22/scalable/Makefile
 		   pidgin/pixmaps/icons/24/Makefile
-		   pidgin/pixmaps/icons/24/scalable/Makefile
 		   pidgin/pixmaps/icons/32/Makefile
-		   pidgin/pixmaps/icons/32/scalable/Makefile
 		   pidgin/pixmaps/icons/48/Makefile
-		   pidgin/pixmaps/icons/48/scalable/Makefile
-		   pidgin/pixmaps/protocols/Makefile
 		   pidgin/pixmaps/protocols/16/Makefile
-		   pidgin/pixmaps/protocols/16/scalable/Makefile
 		   pidgin/pixmaps/protocols/22/Makefile
-		   pidgin/pixmaps/protocols/22/scalable/Makefile
 		   pidgin/pixmaps/protocols/48/Makefile
-		   pidgin/pixmaps/protocols/48/scalable/Makefile
-		   pidgin/pixmaps/status/Makefile
 		   pidgin/pixmaps/status/11/Makefile
-		   pidgin/pixmaps/status/11/scalable/Makefile
 		   pidgin/pixmaps/status/11/rtl/Makefile
 		   pidgin/pixmaps/status/16/Makefile
 		   pidgin/pixmaps/status/16/rtl/Makefile
-		   pidgin/pixmaps/status/16/scalable/Makefile
 		   pidgin/pixmaps/status/22/Makefile
 		   pidgin/pixmaps/status/22/rtl/Makefile
-		   pidgin/pixmaps/status/22/scalable/Makefile
 		   pidgin/pixmaps/status/32/Makefile
 		   pidgin/pixmaps/status/32/rtl/Makefile
-		   pidgin/pixmaps/status/32/scalable/Makefile
 		   pidgin/pixmaps/status/48/Makefile
 		   pidgin/pixmaps/status/48/rtl/Makefile
-		   pidgin/pixmaps/toolbar/Makefile
 		   pidgin/pixmaps/toolbar/16/Makefile
-		   pidgin/pixmaps/toolbar/16/scalable/Makefile
 		   pidgin/pixmaps/toolbar/22/Makefile
-		   pidgin/pixmaps/toolbar/22/scalable/Makefile
-		   pidgin/pixmaps/tray/Makefile
 		   pidgin/pixmaps/tray/16/Makefile
-		   pidgin/pixmaps/tray/16/scalable/Makefile
 		   pidgin/pixmaps/tray/22/Makefile
-		   pidgin/pixmaps/tray/22/scalable/Makefile
 		   pidgin/pixmaps/tray/32/Makefile
 		   pidgin/pixmaps/tray/48/Makefile
 		   pidgin/plugins/Makefile
--- a/pidgin/pixmaps/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,4 +1,416 @@
-SUBDIRS = animations buddy_icons dialogs emblems emotes icons protocols status toolbar tray
+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
+
+MAKEFILE_MINGW = \
+		buddy_icons/qq/Makefile.mingw \
+		dialogs/16/Makefile.mingw \
+		dialogs/64/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
+
+ANIMATIONS_16 = \
+		animations/16/connect0.png \
+		animations/16/connect1.png \
+		animations/16/connect2.png \
+		animations/16/connect3.png \
+		animations/16/connect4.png \
+		animations/16/connect5.png \
+		animations/16/connect6.png \
+		animations/16/connect7.png \
+		animations/16/connect8.png \
+		animations/16/typing0.png \
+		animations/16/typing1.png \
+		animations/16/typing2.png \
+		animations/16/typing3.png \
+		animations/16/typing4.png \
+		animations/16/typing5.png
+
+DIALOGS_16_SCALABLE = \
+		dialogs/16/scalable/error.svg \
+		dialogs/16/scalable/info.svg \
+		dialogs/16/scalable/mail.svg
+
+DIALOGS_64_SCALABLE = \
+		dialogs/64/scalable/auth.svg \
+		dialogs/64/scalable/cool.svg \
+		dialogs/64/scalable/dialog.svg \
+		dialogs/64/scalable/error.svg \
+		dialogs/64/scalable/info.svg \
+		dialogs/64/scalable/question.svg \
+		dialogs/64/scalable/warning.svg
+
+EMBLEMS_16_SCALABLE = \
+		emblems/16/scalable/aol-client.svg \
+		emblems/16/scalable/blocked.svg \
+		emblems/16/scalable/bot.svg \
+		emblems/16/scalable/external.svg \
+		emblems/16/scalable/female.svg \
+		emblems/16/scalable/free-for-chat.svg \
+		emblems/16/scalable/game.svg \
+		emblems/16/scalable/male.svg \
+		emblems/16/scalable/mobile.svg \
+		emblems/16/scalable/music.svg \
+		emblems/16/scalable/not-authorized.svg \
+		emblems/16/scalable/qq-member.svg \
+		emblems/16/scalable/secure.svg \
+		emblems/16/scalable/unavailable.svg \
+		emblems/16/scalable/video.svg \
+		emblems/16/scalable/voice.svg
+
+EMOTES_DEFAULT_24_SCALABLE = \
+		emotes/default/24/scalable/act-up.svg \
+		emotes/default/24/scalable/airplane.svg \
+		emotes/default/24/scalable/alien.svg \
+		emotes/default/24/scalable/angel.svg \
+		emotes/default/24/scalable/angry.svg \
+		emotes/default/24/scalable/arrogant.svg \
+		emotes/default/24/scalable/at-wits-end.svg \
+		emotes/default/24/scalable/bad.svg \
+		emotes/default/24/scalable/bashful.svg \
+		emotes/default/24/scalable/beat-up.svg \
+		emotes/default/24/scalable/beauty.svg \
+		emotes/default/24/scalable/beer.svg \
+		emotes/default/24/scalable/blowkiss.svg \
+		emotes/default/24/scalable/bomb.svg \
+		emotes/default/24/scalable/bowl.svg \
+		emotes/default/24/scalable/boy.svg \
+		emotes/default/24/scalable/brb.svg \
+		emotes/default/24/scalable/bulgy-eyes.svg \
+		emotes/default/24/scalable/bye.svg \
+		emotes/default/24/scalable/cake.svg \
+		emotes/default/24/scalable/call-me.svg \
+		emotes/default/24/scalable/camera.svg \
+		emotes/default/24/scalable/can.svg \
+		emotes/default/24/scalable/car.svg \
+		emotes/default/24/scalable/cat.svg \
+		emotes/default/24/scalable/chicken.svg \
+		emotes/default/24/scalable/clap.svg \
+		emotes/default/24/scalable/clock.svg \
+		emotes/default/24/scalable/cloudy.svg \
+		emotes/default/24/scalable/clover.svg \
+		emotes/default/24/scalable/clown.svg \
+		emotes/default/24/scalable/coffee.svg \
+		emotes/default/24/scalable/coins.svg \
+		emotes/default/24/scalable/computer.svg \
+		emotes/default/24/scalable/confused.svg \
+		emotes/default/24/scalable/console.svg \
+		emotes/default/24/scalable/cowboy.svg \
+		emotes/default/24/scalable/cow.svg \
+		emotes/default/24/scalable/crying.svg \
+		emotes/default/24/scalable/curl-lip.svg \
+		emotes/default/24/scalable/curse.svg \
+		emotes/default/24/scalable/cute.svg \
+		emotes/default/24/scalable/cyclops.svg \
+		emotes/default/24/scalable/dance.svg \
+		emotes/default/24/scalable/dazed.svg \
+		emotes/default/24/scalable/desire.svg \
+		emotes/default/24/scalable/devil.svg \
+		emotes/default/24/scalable/disapointed.svg \
+		emotes/default/24/scalable/disdain.svg \
+		emotes/default/24/scalable/doctor.svg \
+		emotes/default/24/scalable/dog.svg \
+		emotes/default/24/scalable/doh.svg \
+		emotes/default/24/scalable/dont-know.svg \
+		emotes/default/24/scalable/drink.svg \
+		emotes/default/24/scalable/drool.svg \
+		emotes/default/24/scalable/eat.svg \
+		emotes/default/24/scalable/embarrassed.svg \
+		emotes/default/24/scalable/excruciating.svg \
+		emotes/default/24/scalable/eyeroll.svg \
+		emotes/default/24/scalable/female-fighter.svg \
+		emotes/default/24/scalable/film.svg \
+		emotes/default/24/scalable/fingers-crossed.svg \
+		emotes/default/24/scalable/flag.svg \
+		emotes/default/24/scalable/foot-in-mouth.svg \
+		emotes/default/24/scalable/freaked-out.svg \
+		emotes/default/24/scalable/ghost.svg \
+		emotes/default/24/scalable/giggle.svg \
+		emotes/default/24/scalable/girl.svg \
+		emotes/default/24/scalable/glasses-cool.svg \
+		emotes/default/24/scalable/glasses-nerdy.svg \
+		emotes/default/24/scalable/goat.svg \
+		emotes/default/24/scalable/go-away.svg \
+		emotes/default/24/scalable/good.svg \
+		emotes/default/24/scalable/hammer.svg \
+		emotes/default/24/scalable/handcuffs.svg \
+		emotes/default/24/scalable/handshake.svg \
+		emotes/default/24/scalable/highfive.svg \
+		emotes/default/24/scalable/hug-left.svg \
+		emotes/default/24/scalable/hug-right.svg \
+		emotes/default/24/scalable/hypnotized.svg \
+		emotes/default/24/scalable/in-love.svg \
+		emotes/default/24/scalable/island.svg \
+		emotes/default/24/scalable/jump.svg \
+		emotes/default/24/scalable/kissed.svg \
+		emotes/default/24/scalable/kissing.svg \
+		emotes/default/24/scalable/kiss.svg \
+		emotes/default/24/scalable/knife.svg \
+		emotes/default/24/scalable/lamp.svg \
+		emotes/default/24/scalable/lashes.svg \
+		emotes/default/24/scalable/laugh.svg \
+		emotes/default/24/scalable/liquor.svg \
+		emotes/default/24/scalable/loser.svg \
+		emotes/default/24/scalable/love-over.svg \
+		emotes/default/24/scalable/love.svg \
+		emotes/default/24/scalable/lying.svg \
+		emotes/default/24/scalable/madtongue.svg \
+		emotes/default/24/scalable/mail.svg \
+		emotes/default/24/scalable/male-fighter1.svg \
+		emotes/default/24/scalable/male-fighter2.svg \
+		emotes/default/24/scalable/mean.svg \
+		emotes/default/24/scalable/meeting.svg \
+		emotes/default/24/scalable/messed.svg \
+		emotes/default/24/scalable/mobile.svg \
+		emotes/default/24/scalable/mohawk.svg \
+		emotes/default/24/scalable/moneymouth.svg \
+		emotes/default/24/scalable/monkey.svg \
+		emotes/default/24/scalable/moon.svg \
+		emotes/default/24/scalable/msn-away.svg \
+		emotes/default/24/scalable/msn-busy.svg \
+		emotes/default/24/scalable/msn_online.svg \
+		emotes/default/24/scalable/msn.svg \
+		emotes/default/24/scalable/musical-note.svg \
+		emotes/default/24/scalable/music.svg \
+		emotes/default/24/scalable/nailbiting.svg \
+		emotes/default/24/scalable/neutral.svg \
+		emotes/default/24/scalable/on-the-phone.svg \
+		emotes/default/24/scalable/party.svg \
+		emotes/default/24/scalable/peace.svg \
+		emotes/default/24/scalable/phone.svg \
+		emotes/default/24/scalable/pig.svg \
+		emotes/default/24/scalable/pill.svg \
+		emotes/default/24/scalable/pirate.svg \
+		emotes/default/24/scalable/pissed-off.svg \
+		emotes/default/24/scalable/pizza.svg \
+		emotes/default/24/scalable/plate.svg \
+		emotes/default/24/scalable/poop.svg \
+		emotes/default/24/scalable/pray.svg \
+		emotes/default/24/scalable/present.svg \
+		emotes/default/24/scalable/qq.svg \
+		emotes/default/24/scalable/question.svg \
+		emotes/default/24/scalable/quiet.svg \
+		emotes/default/24/scalable/rainbow.svg \
+		emotes/default/24/scalable/rain.svg \
+		emotes/default/24/scalable/rose-dead.svg \
+		emotes/default/24/scalable/rose.svg \
+		emotes/default/24/scalable/rotfl.svg \
+		emotes/default/24/scalable/sad.svg \
+		emotes/default/24/scalable/sarcastic.svg \
+		emotes/default/24/scalable/search.svg \
+		emotes/default/24/scalable/secret.svg \
+		emotes/default/24/scalable/shame.svg \
+		emotes/default/24/scalable/sheep.svg \
+		emotes/default/24/scalable/shock.svg \
+		emotes/default/24/scalable/shout.svg \
+		emotes/default/24/scalable/shut-mouth.svg \
+		emotes/default/24/scalable/sick.svg \
+		emotes/default/24/scalable/sidefrown.svg \
+		emotes/default/24/scalable/sigarette.svg \
+		emotes/default/24/scalable/silly.svg \
+		emotes/default/24/scalable/sinister.svg \
+		emotes/default/24/scalable/skeleton.svg \
+		emotes/default/24/scalable/skywalker.svg \
+		emotes/default/24/scalable/sleepy.svg \
+		emotes/default/24/scalable/smile-big.svg \
+		emotes/default/24/scalable/smile.svg \
+		emotes/default/24/scalable/smirk.svg \
+		emotes/default/24/scalable/snail.svg \
+		emotes/default/24/scalable/snicker.svg \
+		emotes/default/24/scalable/snowman.svg \
+		emotes/default/24/scalable/soccerball.svg \
+		emotes/default/24/scalable/soldier.svg \
+		emotes/default/24/scalable/star.svg \
+		emotes/default/24/scalable/starving.svg \
+		emotes/default/24/scalable/stop.svg \
+		emotes/default/24/scalable/struggle.svg \
+		emotes/default/24/scalable/sun.svg \
+		emotes/default/24/scalable/sweat.svg \
+		emotes/default/24/scalable/talktohand.svg \
+		emotes/default/24/scalable/teeth.svg \
+		emotes/default/24/scalable/terror.svg \
+		emotes/default/24/scalable/thinking.svg \
+		emotes/default/24/scalable/thunder.svg \
+		emotes/default/24/scalable/time-out.svg \
+		emotes/default/24/scalable/tongue.svg \
+		emotes/default/24/scalable/tremble.svg \
+		emotes/default/24/scalable/turtle.svg \
+		emotes/default/24/scalable/tv.svg \
+		emotes/default/24/scalable/umbrella.svg \
+		emotes/default/24/scalable/vampire.svg \
+		emotes/default/24/scalable/victory.svg \
+		emotes/default/24/scalable/waiting.svg \
+		emotes/default/24/scalable/watermelon.svg \
+		emotes/default/24/scalable/waving.svg \
+		emotes/default/24/scalable/weep.svg \
+		emotes/default/24/scalable/wilt.svg \
+		emotes/default/24/scalable/wink.svg \
+		emotes/default/24/scalable/worship.svg \
+		emotes/default/24/scalable/yawn.svg \
+		emotes/default/24/scalable/yin-yang.svg
+
+PROTOCOLS_16_SCALABLE = \
+		protocols/16/scalable/aim.svg \
+		protocols/16/scalable/bonjour.svg \
+		protocols/16/scalable/gadu-gadu.svg \
+		protocols/16/scalable/novell.svg \
+		protocols/16/scalable/icq.svg \
+		protocols/16/scalable/irc.svg \
+		protocols/16/scalable/jabber.svg \
+		protocols/16/scalable/meanwhile.svg \
+		protocols/16/scalable/msn.svg \
+		protocols/16/scalable/qq.svg \
+		protocols/16/scalable/silc.svg \
+		protocols/16/scalable/simple.svg \
+		protocols/16/scalable/yahoo.svg \
+		protocols/16/scalable/zephyr.svg
+
+ICONS_16_SCALABLE = \
+		icons/16/scalable/pidgin.svg
+
+ICONS_22_SCALABLE = \
+		icons/22/scalable/pidgin.svg
+
+ICONS_24_SCALABLE = \
+		icons/24/scalable/pidgin.svg
+
+ICONS_32_SCALABLE = \
+		icons/32/scalable/pidgin.svg
+
+ICONS_48_SCALABLE = \
+		icons/48/scalable/pidgin.svg
+
+PROTOCOLS_22_SCALABLE = \
+		protocols/22/scalable/aim.svg \
+		protocols/22/scalable/bonjour.svg \
+		protocols/22/scalable/gadu-gadu.svg \
+		protocols/22/scalable/novell.svg \
+		protocols/22/scalable/icq.svg \
+		protocols/22/scalable/irc.svg \
+		protocols/22/scalable/jabber.svg \
+		protocols/22/scalable/meanwhile.svg \
+		protocols/22/scalable/msn.svg \
+		protocols/22/scalable/qq.svg \
+		protocols/22/scalable/silc.svg \
+		protocols/22/scalable/simple.svg \
+		protocols/22/scalable/yahoo.svg \
+		protocols/22/scalable/zephyr.svg
+
+PROTOCOLS_48_SCALABLE = \
+		protocols/48/scalable/aim.svg \
+		protocols/48/scalable/bonjour.svg \
+		protocols/48/scalable/gadu-gadu.svg \
+		protocols/48/scalable/google-talk.svg \
+		protocols/48/scalable/novell.svg \
+		protocols/48/scalable/icq.svg \
+		protocols/48/scalable/irc.svg \
+		protocols/48/scalable/jabber.svg \
+		protocols/48/scalable/meanwhile.svg \
+		protocols/48/scalable/msn.svg \
+		protocols/48/scalable/qq.svg \
+		protocols/48/scalable/silc.svg \
+		protocols/48/scalable/simple.svg \
+		protocols/48/scalable/yahoo.svg \
+		protocols/48/scalable/zephyr.svg
+
+STATUS_11_SCALABLE = \
+		status/11/scalable/available.svg \
+		status/11/scalable/away.svg \
+		status/11/scalable/busy.svg \
+		status/11/scalable/chat.svg \
+		status/11/scalable/extended-away.svg \
+		status/11/scalable/invisible.svg \
+		status/11/scalable/offline.svg \
+		status/11/scalable/person.svg
+
+STATUS_16_SCALABLE = \
+		status/16/scalable/available.svg \
+		status/16/scalable/away.svg \
+		status/16/scalable/busy.svg \
+		status/16/scalable/chat.svg \
+		status/16/scalable/extended-away.svg \
+		status/16/scalable/log-in.svg \
+		status/16/scalable/log-out.svg \
+		status/16/scalable/message-pending.svg \
+		status/16/scalable/offline.svg \
+		status/16/scalable/person.svg
+
+STATUS_22_SCALABLE = \
+		status/22/scalable/available.svg \
+		status/22/scalable/away.svg \
+		status/22/scalable/busy.svg \
+		status/22/scalable/chat.svg \
+		status/22/scalable/extended-away.svg \
+		status/22/scalable/log-in.svg \
+		status/22/scalable/log-out.svg \
+		status/22/scalable/offline.svg \
+		status/22/scalable/person.svg
+
+STATUS_32_SCALABLE = \
+		status/32/scalable/available.svg \
+		status/32/scalable/away.svg \
+		status/32/scalable/busy.svg \
+		status/32/scalable/chat.svg \
+		status/32/scalable/extended-away.svg \
+		status/32/scalable/log-in.svg \
+		status/32/scalable/log-out.svg \
+		status/32/scalable/offline.svg \
+		status/32/scalable/person.svg
+
+TOOLBAR_11 = \
+		toolbar/11/message-new.png
+
+TOOLBAR_16_SCALABLE = \
+		toolbar/16/scalable/change-bgcolor.svg \
+		toolbar/16/scalable/change-fgcolor.svg \
+		toolbar/16/scalable/emote-select.svg \
+		toolbar/16/scalable/font-size-down.svg \
+		toolbar/16/scalable/font-size-up.svg
+
+TOOLBAR_22_SCALABLE = \
+		toolbar/22/scalable/select-avatar.svg
+
+TRAY_16_SCALABLE = \
+		tray/16/scalable/tray-away.svg \
+		tray/16/scalable/tray-busy.svg \
+		tray/16/scalable/tray-connecting.svg \
+		tray/16/scalable/tray-extended-away.svg \
+		tray/16/scalable/tray-invisible.svg \
+		tray/16/scalable/tray-message.svg \
+		tray/16/scalable/tray-offline.svg \
+		tray/16/scalable/tray-online.svg
+
+TRAY_22_SCALABLE = \
+		tray/22/scalable/tray-invisible.svg

 EXTRA_DIST = \
 		edit.png			\
@@ -10,7 +422,29 @@
 		arrow-right.xpm		\
 		arrow-left.xpm		\
 		Makefile.mingw			\
-		pidgin.ico
+		pidgin.ico		\
+		$(MAKEFILE_MINGW)	\
+		$(DIALOGS_16_SCALABLE)	\
+		$(DIALOGS_64_SCALABLE)	\
+		$(ICONS_16_SCALABLE)	\
+		$(ICONS_22_SCALABLE)	\
+		$(ICONS_24_SCALABLE)	\
+		$(ICONS_32_SCALABLE)	\
+		$(ICONS_48_SCALABLE)	\
+		$(EMBLEMS_16_SCALABLE)	\
+		$(EMOTES_DEFAULT_24_SCALABLE)	\
+		$(PROTOCOLS_16_SCALABLE)	\
+		$(PROTOCOLS_22_SCALABLE)	\
+		$(PROTOCOLS_48_SCALABLE)	\
+		$(STATUS_11_SCALABLE)	\
+		$(STATUS_16_SCALABLE)	\
+		$(STATUS_22_SCALABLE)   \
+		$(STATUS_32_SCALABLE)	\
+		$(TOOLBAR_11)		\
+		$(TOOLBAR_16_SCALABLE)	\
+		$(TOOLBAR_22_SCALABLE)	\
+		$(TRAY_16_SCALABLE)	\
+		$(TRAY_22_SCALABLE)

 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
 pidginbuttonpix_DATA = edit.png pause.png info.png
@@ -18,3 +452,4 @@
 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)
--- a/pidgin/pixmaps/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Sun Nov 04 18:32:14 2007 +0000
@@ -15,7 +15,16 @@
 install:
 	if test '$(SUBDIRS)'; then \
 	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if [ "$$subdir" != "icons/22" ]; then \
 	    $(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) install || exit 1 ;\
+	  fi \
+	  done; \
+	fi;
+	if test '$(nobase_dist_pidginpixmap_DATA)'; then \
+	  list='$(nobase_dist_pidginpixmap_DATA)'; for file in $$list; do \
+	    dir=`dirname $$file`; \
+	    mkdir -p $(pidginpixmapdir)/$$dir; \
+	    cp $$file $(pidginpixmapdir)/$$dir/; \
 	  done; \
 	fi;
 	if test '$(pidginbuttonpix_DATA)'; then \
--- a/pidgin/pixmaps/animations/16/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-EXTRA_DIST = 	connect0.png \
-		connect1.png \
-		connect2.png \
-		connect3.png \
-		connect4.png \
-		connect5.png \
-		connect6.png \
-		connect7.png \
-		connect8.png \
-		typing0.png \
-		typing1.png \
-		typing2.png \
-		typing3.png \
-		typing4.png \
-		typing5.png
-
-pidginanimpixdir = $(datadir)/pixmaps/pidgin/animations/16
-pidginanimpix_DATA = $(EXTRA_DIST)
--- a/pidgin/pixmaps/animations/16/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-PIDGIN_TREE_TOP := ../../../..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-datadir = $(PIDGIN_INSTALL_DIR)
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(pidginanimpix_DATA)'; then \
-	  mkdir -p $(pidginanimpixdir); \
-	  cp $(pidginanimpix_DATA) $(pidginanimpixdir); \
-	fi;
-
--- a/pidgin/pixmaps/animations/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-SUBDIRS = 16
-
-EXTRA_DIST = \
-	Makefile.mingw \
-	16/Makefile.mingw
--- a/pidgin/pixmaps/animations/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
--- a/pidgin/pixmaps/buddy_icons/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-SUBDIRS = qq
-
-EXTRA_DIST = \
-	Makefile.mingw \
-	qq/Makefile.mingw
--- a/pidgin/pixmaps/buddy_icons/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
--- a/pidgin/pixmaps/dialogs/16/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/dialogs/16/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = 	auth.png \
 		error.png \
 		info.png \
--- a/pidgin/pixmaps/dialogs/16/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXTRA_DIST = 	error.svg \
-	     	info.svg \
-		mail.svg
--- a/pidgin/pixmaps/dialogs/64/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/dialogs/64/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = 	auth.png \
 		cool.png \
 		dialog.png \
--- a/pidgin/pixmaps/dialogs/64/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-EXTRA_DIST =	auth.svg \
-		cool.svg \
-		dialog.svg \
-		error.svg \
-		info.svg \
-		question.svg \
-		warning.svg
--- a/pidgin/pixmaps/dialogs/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-SUBDIRS = 16 64
-
-EXTRA_DIST = \
-	Makefile.mingw \
-	16/Makefile.mingw \
-	64/Makefile.mingw
--- a/pidgin/pixmaps/dialogs/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
--- a/pidgin/pixmaps/emblems/16/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/emblems/16/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = 	aol-client.png \
 		birthday.png \
 		blocked.png \
--- a/pidgin/pixmaps/emblems/16/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-EXTRA_DIST =	aol-client.svg \
-		blocked.svg \
-		bot.svg \
-		external.svg \
-		female.svg \
-		free-for-chat.svg \
-		game.svg \
-		male.svg \
-		mobile.svg \
-		music.svg \
-		not-authorized.svg \
-		qq-member.svg \
-		secure.svg \
-		unavailable.svg \
-		video.svg \
-		voice.svg
--- a/pidgin/pixmaps/emblems/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-SUBDIRS = 16
-
-EXTRA_DIST = \
-	Makefile.mingw \
-	16/Makefile.mingw
--- a/pidgin/pixmaps/emblems/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
--- a/pidgin/pixmaps/emotes/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-SUBDIRS=default none
-
-EXTRA_DIST = Makefile.mingw
--- a/pidgin/pixmaps/emotes/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install clean
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
-
-clean:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw clean || exit 1; \
-	  done; \
-	fi;
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 SMILEYS = 	act-up.png \
     airplane.png \
     alien.png \
--- a/pidgin/pixmaps/emotes/default/24/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,189 +0,0 @@
-SMILEYS = 	act-up.svg \
-    airplane.svg \
-    alien.svg \
-    angel.svg \
-    angry.svg \
-    arrogant.svg \
-    at-wits-end.svg \
-    bad.svg \
-    bashful.svg \
-    beat-up.svg \
-    beauty.svg \
-    beer.svg \
-    blowkiss.svg \
-    bomb.svg \
-    bowl.svg \
-    boy.svg \
-    brb.svg \
-    bulgy-eyes.svg \
-    bye.svg \
-    cake.svg \
-    call-me.svg \
-    camera.svg \
-    can.svg \
-    car.svg \
-    cat.svg \
-    chicken.svg \
-    clap.svg \
-    clock.svg \
-    cloudy.svg \
-    clover.svg \
-    clown.svg \
-    coffee.svg \
-    coins.svg \
-    computer.svg \
-    confused.svg \
-    console.svg \
-    cowboy.svg \
-    cow.svg \
-    crying.svg \
-    curl-lip.svg \
-    curse.svg \
-    cute.svg \
-    cyclops.svg \
-    dance.svg \
-    dazed.svg \
-    desire.svg \
-    devil.svg \
-    disapointed.svg \
-    disdain.svg \
-    doctor.svg \
-    dog.svg \
-    doh.svg \
-    dont-know.svg \
-    drink.svg \
-    drool.svg \
-    eat.svg \
-    embarrassed.svg \
-    excruciating.svg \
-    eyeroll.svg \
-    female-fighter.svg \
-    film.svg \
-    fingers-crossed.svg \
-    flag.svg \
-    foot-in-mouth.svg \
-    freaked-out.svg \
-    ghost.svg \
-    giggle.svg \
-    girl.svg \
-    glasses-cool.svg \
-    glasses-nerdy.svg \
-    goat.svg \
-    go-away.svg \
-    good.svg \
-    hammer.svg \
-    handcuffs.svg \
-    handshake.svg \
-    highfive.svg \
-    hug-left.svg \
-    hug-right.svg \
-    hypnotized.svg \
-    in-love.svg \
-    island.svg \
-    jump.svg \
-    kissed.svg \
-    kissing.svg \
-    kiss.svg \
-    knife.svg \
-    lamp.svg \
-    lashes.svg \
-    laugh.svg \
-    liquor.svg \
-    loser.svg \
-    love-over.svg \
-    love.svg \
-    lying.svg \
-    madtongue.svg \
-    mail.svg \
-    male-fighter1.svg \
-    male-fighter2.svg \
-    mean.svg \
-    meeting.svg \
-    messed.svg \
-    mobile.svg \
-    mohawk.svg \
-    moneymouth.svg \
-    monkey.svg \
-    moon.svg \
-    msn-away.svg \
-    msn-busy.svg \
-    msn_online.svg \
-    msn.svg \
-    musical-note.svg \
-    music.svg \
-    nailbiting.svg \
-    neutral.svg \
-    on-the-phone.svg \
-    party.svg \
-    peace.svg \
-    phone.svg \
-    pig.svg \
-    pill.svg \
-    pirate.svg \
-    pissed-off.svg \
-    pizza.svg \
-    plate.svg \
-    poop.svg \
-    pray.svg \
-    present.svg \
-    qq.svg \
-    question.svg \
-    quiet.svg \
-    rainbow.svg \
-    rain.svg \
-    rose-dead.svg \
-    rose.svg \
-    rotfl.svg \
-    sad.svg \
-    sarcastic.svg \
-    search.svg \
-    secret.svg \
-    shame.svg \
-    sheep.svg \
-    shock.svg \
-    shout.svg \
-    shut-mouth.svg \
-    sick.svg \
-    sidefrown.svg \
-    sigarette.svg \
-    silly.svg \
-    sinister.svg \
-    skeleton.svg \
-    skywalker.svg \
-    sleepy.svg \
-    smile-big.svg \
-    smile.svg \
-    smirk.svg \
-    snail.svg \
-    snicker.svg \
-    snowman.svg \
-    soccerball.svg \
-    soldier.svg \
-    star.svg \
-    starving.svg \
-    stop.svg \
-    struggle.svg \
-    sun.svg \
-    sweat.svg \
-    talktohand.svg \
-    teeth.svg \
-    terror.svg \
-    thinking.svg \
-    thunder.svg \
-    time-out.svg \
-    tongue.svg \
-    tremble.svg \
-    turtle.svg \
-    tv.svg \
-    umbrella.svg \
-    vampire.svg \
-    victory.svg \
-    waiting.svg \
-    watermelon.svg \
-    waving.svg \
-    weep.svg \
-    wilt.svg \
-    wink.svg \
-    worship.svg \
-    yawn.svg \
-    yin-yang.svg
--- a/pidgin/pixmaps/emotes/default/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-SUBDIRS=24
-
-EXTRA_DIST= \
-	Makefile.mingw \
-	24/Makefile.mingw
--- a/pidgin/pixmaps/icons/16/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/icons/16/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = pidgin.png

 pidginiconspixdir = $(datadir)/icons/hicolor/16x16/apps
--- a/pidgin/pixmaps/icons/16/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST = 	pidgin.svg
--- a/pidgin/pixmaps/icons/22/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/icons/22/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = pidgin.png

 pidginiconspixdir = $(datadir)/icons/hicolor/22x22/apps
--- a/pidgin/pixmaps/icons/22/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST = 	pidgin.svg
--- a/pidgin/pixmaps/icons/24/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/icons/24/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = pidgin.png

 pidginiconspixdir = $(datadir)/icons/hicolor/24x24/apps
--- a/pidgin/pixmaps/icons/24/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST = 	pidgin.svg
--- a/pidgin/pixmaps/icons/32/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/icons/32/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = pidgin.png

 pidginiconspixdir = $(datadir)/icons/hicolor/32x32/apps
--- a/pidgin/pixmaps/icons/32/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST = 	pidgin.svg
--- a/pidgin/pixmaps/icons/48/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/icons/48/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = pidgin.png

 pidginiconspixdir = $(datadir)/icons/hicolor/48x48/apps
--- a/pidgin/pixmaps/icons/48/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXTRA_DIST = pidgin.svg
-
-pidginiconspixdir = $(datadir)/icons/hicolor/scalable/apps
-
-pidginiconspix_DATA = $(EXTRA_DIST)
-
--- a/pidgin/pixmaps/icons/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-SUBDIRS = 16 22 24 32 48
-
-EXTRA_DIST = \
-	Makefile.mingw \
-	16/Makefile.mingw \
-	24/Makefile.mingw \
-	32/Makefile.mingw \
-	48/Makefile.mingw
-
--- a/pidgin/pixmaps/icons/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-install:
-
-install_real:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if [ "$$subdir" != "22" ]; then \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  fi; \
-	  done; \
-	fi;
-
--- a/pidgin/pixmaps/protocols/16/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/protocols/16/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST =	aim.png \
 		bonjour.png \
 		gadu-gadu.png \
--- a/pidgin/pixmaps/protocols/16/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-EXTRA_DIST = 	aim.svg \
-		bonjour.svg \
-		gadu-gadu.svg \
-		novell.svg \
-		icq.svg \
-		irc.svg \
-		jabber.svg \
-		meanwhile.svg \
-		msn.svg \
-		qq.svg \
-		silc.svg \
-		simple.svg \
-		yahoo.svg \
-		zephyr.svg
--- a/pidgin/pixmaps/protocols/22/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/protocols/22/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST =	aim.png \
 		bonjour.png \
 		gadu-gadu.png \
--- a/pidgin/pixmaps/protocols/22/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-EXTRA_DIST = 	aim.svg \
-		bonjour.svg \
-		gadu-gadu.svg \
-		novell.svg \
-		icq.svg \
-		irc.svg \
-		jabber.svg \
-		meanwhile.svg \
-		msn.svg \
-		qq.svg \
-		silc.svg \
-		simple.svg \
-		yahoo.svg \
-		zephyr.svg
--- a/pidgin/pixmaps/protocols/48/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/protocols/48/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST =	aim.png \
 		bonjour.png \
 		gadu-gadu.png \
--- a/pidgin/pixmaps/protocols/48/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-EXTRA_DIST = 	aim.svg \
-		bonjour.svg \
-		gadu-gadu.svg \
-		google-talk.svg \
-		novell.svg \
-		icq.svg \
-		irc.svg \
-		jabber.svg \
-		meanwhile.svg \
-		msn.svg \
-		qq.svg \
-		silc.svg \
-		simple.svg \
-		yahoo.svg \
-		zephyr.svg
--- a/pidgin/pixmaps/protocols/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-SUBDIRS = 16 22 48
-
-EXTRA_DIST = \
-	Makefile.mingw \
-	16/Makefile.mingw \
-	22/Makefile.mingw \
-	48/Makefile.mingw
-
--- a/pidgin/pixmaps/protocols/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-.PHONY: install
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
--- a/pidgin/pixmaps/status/11/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/status/11/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = scalable rtl
+SUBDIRS = rtl

 EXTRA_DIST = 	available.png \
 		away.png \
--- a/pidgin/pixmaps/status/11/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-EXTRA_DIST = 	available.svg \
-		away.svg \
-		busy.svg \
-		chat.svg \
-		extended-away.svg \
-		invisible.svg \
-		offline.svg \
-		person.svg
--- a/pidgin/pixmaps/status/16/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/status/16/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = rtl scalable
+SUBDIRS = rtl

 EXTRA_DIST = 	available.png \
 		away.png \
--- a/pidgin/pixmaps/status/16/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-EXTRA_DIST = 	available.svg \
-		away.svg \
-		busy.svg \
-		chat.svg \
-		extended-away.svg \
-		log-in.svg \
-		log-out.svg \
-		message-pending.svg \
-		offline.svg \
-		person.svg
-
-#		half-operator.svg
-#		operator.svg
--- a/pidgin/pixmaps/status/22/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/status/22/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = rtl scalable
+SUBDIRS = rtl

 EXTRA_DIST = 	available.png \
 		away.png \
--- a/pidgin/pixmaps/status/22/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXTRA_DIST = 	available.svg \
-		away.svg \
-		busy.svg \
-		chat.svg \
-		extended-away.svg \
-		log-in.svg \
-		log-out.svg \
-		offline.svg \
-		person.svg
--- a/pidgin/pixmaps/status/32/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/status/32/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = rtl scalable
+SUBDIRS = rtl

 EXTRA_DIST = 	available.png \
 		away.png \
--- a/pidgin/pixmaps/status/32/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXTRA_DIST = 	available.svg \
-		away.svg \
-		busy.svg \
-		chat.svg \
-		extended-away.svg \
-		log-in.svg \
-		log-out.svg \
-		offline.svg \
-		person.svg
--- a/pidgin/pixmaps/status/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-SUBDIRS = 11 16 22 32 48
-
-EXTRA_DIST = \
-	Makefile.mingw \
-	11/Makefile.mingw \
-	11/rtl/Makefile.mingw \
-	16/Makefile.mingw \
-	16/rtl/Makefile.mingw \
-	22/Makefile.mingw \
-	22/rtl/Makefile.mingw \
-	32/Makefile.mingw \
-	32/rtl/Makefile.mingw \
-	48/Makefile.mingw \
-	48/rtl/Makefile.mingw
-
--- a/pidgin/pixmaps/status/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
--- a/pidgin/pixmaps/toolbar/16/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = change-bgcolor.png \
 		change-fgcolor.png \
 		emote-select.png \
--- a/pidgin/pixmaps/toolbar/16/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-EXTRA_DIST = change-bgcolor.svg \
-		change-fgcolor.svg \
-		emote-select.svg \
-		font-size-down.svg \
-		font-size-up.svg
--- a/pidgin/pixmaps/toolbar/22/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/toolbar/22/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 EXTRA_DIST = select-avatar.png

 pidgintoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/22
--- a/pidgin/pixmaps/toolbar/22/scalable/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-EXTRA_DIST = select-avatar.svg
--- a/pidgin/pixmaps/toolbar/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-SUBDIRS = 16 22
-
-TINY_ICONS = 11/message-new.png
-EXTRA_DIST = \
-	Makefile.mingw \
-	16/Makefile.mingw \
-	22/Makefile.mingw \
-	$(TINY_ICONS)
-
-pidgintinytoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/11
-pidgintinytoolbarpix_DATA = $(TINY_ICONS)
--- a/pidgin/pixmaps/toolbar/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;
--- a/pidgin/pixmaps/tray/16/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/tray/16/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 TRAY_ICONS =	tray-away.png \
 		tray-busy.png \
 		tray-invisible.png \
--- a/pidgin/pixmaps/tray/22/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ b/pidgin/pixmaps/tray/22/Makefile.am	Sun Nov 04 18:32:14 2007 +0000
@@ -1,5 +1,3 @@
-SUBDIRS = scalable
-
 TRAY_ICONS =	tray-away.png \
 		tray-busy.png \
 		tray-connecting.png \
--- a/pidgin/pixmaps/tray/Makefile.am	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-SUBDIRS = 16 22 32 48
-
-EXTRA_DIST = \
-	Makefile.mingw \
-	16/Makefile.mingw \
-	22/Makefile.mingw \
-	32/Makefile.mingw \
-	48/Makefile.mingw
-
--- a/pidgin/pixmaps/tray/Makefile.mingw	Sun Nov 04 04:41:09 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
-#
-
-include ./Makefile.am
-
-install:
-	if test '$(SUBDIRS)'; then \
-	  list='$(SUBDIRS)'; for subdir in $$list; do \
-	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
-	  done; \
-	fi;