Mercurial > pidgin
changeset 21036:97f70e18c610
Remove the Makefile.am for a directory which actually installs files,
pidgin/pixmaps/animations/16. This uses an automake nobase_ rule,
which is apparently "new", but I think has been around since at least
1.6. This might make people scream. It will also certainly require
Makefile.mingw changes, but hopefully the pixmap DATA rule can be used
to minimize the pain.
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Sun, 28 Oct 2007 15:06:33 +0000 |
| parents | 50ec72d78902 |
| children | 54c33a552eb6 |
| files | configure.ac pidgin/pixmaps/Makefile.am pidgin/pixmaps/animations/16/Makefile.am |
| diffstat | 3 files changed, 21 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sun Oct 28 14:38:38 2007 +0000 +++ b/configure.ac Sun Oct 28 15:06:33 2007 +0000 @@ -2178,7 +2178,6 @@ pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pixmaps/Makefile - pidgin/pixmaps/animations/16/Makefile pidgin/pixmaps/buddy_icons/qq/Makefile pidgin/pixmaps/dialogs/16/Makefile pidgin/pixmaps/dialogs/64/Makefile
--- a/pidgin/pixmaps/Makefile.am Sun Oct 28 14:38:38 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Sun Oct 28 15:06:33 2007 +0000 @@ -1,4 +1,6 @@ -SUBDIRS = animations/16 buddy_icons/qq dialogs/16 dialogs/64 emblems/16 \ +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 \ @@ -37,6 +39,23 @@ 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 \ @@ -434,3 +453,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/animations/16/Makefile.am Sun Oct 28 14:38:38 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)