Mercurial > pidgin
diff pidgin/pixmaps/Makefile.am @ 21033:9347a942b7cd
This is the first step toward rationalizing our Makefiles to reduce
the number of directories we have to traverse. This commit removes
all Makefiles under pidgin/pixmaps which don't actually do anything --
if it contained nothing but SUBDIRS and/or EXTRA_DIST, it's gone now.
This almost certainly breaks Windows builds. I believe they can be
(mostly?) fixed by simply removing intermediate Makefile.mingws
(corresponding to removed Makefile.ams; both from their locations and
from pidgin/pixmaps/Makefile.am), but as I can't test it, I didn't
mess with them.
Note that even this simple reduction cut out 31 directories from the
build process. Similar changes can probably be made in other places
in the tree, above pidgin/pixmaps/.
Next step: directories which install files, but have no rules.
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Sun, 28 Oct 2007 04:46:01 +0000 |
| parents | 2f0960548c1d |
| children | 50ec72d78902 |
line wrap: on
line diff
--- a/pidgin/pixmaps/Makefile.am Sat Oct 27 17:47:48 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Sun Oct 28 04:46:01 2007 +0000 @@ -1,4 +1,408 @@ -SUBDIRS = animations buddy_icons dialogs emblems emotes icons protocols status toolbar tray +SUBDIRS = animations/16 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 = \ + animations/Makefile.mingw \ + animations/16/Makefile.mingw \ + buddy_icons/Makefile.mingw \ + buddy_icons/qq/Makefile.mingw \ + dialogs/Makefile.mingw \ + dialogs/16/Makefile.mingw \ + dialogs/64/Makefile.mingw \ + icons/Makefile.mingw \ + icons/16/Makefile.mingw \ + icons/24/Makefile.mingw \ + icons/32/Makefile.mingw \ + icons/48/Makefile.mingw \ + emotes/Makefile.mingw \ + emotes/default/Makefile.mingw \ + emotes/default/24/Makefile.mingw \ + emotes/none/Makefile.mingw \ + emblems/Makefile.mingw \ + emblems/16/Makefile.mingw \ + protocols/Makefile.mingw \ + protocols/22/Makefile.mingw \ + protocols/48/Makefile.mingw \ + status/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/Makefile.mingw \ + toolbar/16/Makefile.mingw \ + toolbar/22/Makefile.mingw \ + tray/Makefile.mingw \ + tray/16/Makefile.mingw \ + tray/22/Makefile.mingw \ + tray/32/Makefile.mingw \ + tray/48/Makefile.mingw + +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 +414,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