im.pidgin.elb.make: bfa540abf4bed20d5358b97310ce1bd6b331b5e8

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: bfa540abf4bed20d5358b97310ce1bd6b331b5e8
Ancestor: 18320d04c02cfcf91a5a2267ce38cf807d6b8151
Author: elb at pidgin.im
Date: 2007-10-28T15:06:33
Branch: im.pidgin.elb.make

Deleted entries:
        pidgin/pixmaps/animations/16/Makefile.am
Modified files:
        configure.ac pidgin/pixmaps/Makefile.am

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- configure.ac	8485be669dc207f08ad829ae3ce5d311e79aeb8c
+++ configure.ac	04fa2ed04348a0a3fd118a1f3626f03684302aa2
@@ -2178,7 +2178,6 @@ AC_OUTPUT([Makefile
 		   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
============================================================
--- pidgin/pixmaps/Makefile.am	757c3b877d384a9de80c25ae4d70e03fb36bf7e4
+++ pidgin/pixmaps/Makefile.am	dae8a1d862ec369bbce045abbeff8f90811f9c44
@@ -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 @@ 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 \
@@ -434,3 +453,4 @@ 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)