# HG changeset patch
# User fingolfin
# Date 1011816051 0
# Node ID ff6e66f54ece3029afbe21151b196841b26fc440
# Parent  30e21a90f3b1e21dca1f47eec27266937b37f64b
fixed decoders/Makefile.am

diff -r 30e21a90f3b1 -r ff6e66f54ece CHANGELOG
--- a/CHANGELOG	Sun Jan 20 21:24:17 2002 +0000
+++ b/CHANGELOG	Wed Jan 23 20:00:51 2002 +0000
@@ -2,7 +2,9 @@
  * CHANGELOG.
  */
 
-01192001 - Torbjörn sent in patches implementing the rewind method for the
+01232002 - Fixed decoders/Makefile.am to work with seperate build directories.
+           Corrected some dates in this file.
+01192002 - Torbjörn sent in patches implementing the rewind method for the
            rest of the decoders except shn.c, for which I added a kludged
            implementation. Added more info to the README. Hunted down the
            reason why SMPEG can't decode before calling SDL_OpenAudio(), and
@@ -11,7 +13,7 @@
            Mutex-protected the internal samples list, and fixed some bugs in
            the management of that list. Changed some stuff to use uniform
            coding conventions.
-01182001 - SDL_sound/playsound builds and runs on BeOS now. Fixed an assertion
+01182002 - SDL_sound/playsound builds and runs on BeOS now. Fixed an assertion
            bug I introduced yesterday.
 01172002 - Implemented Sound_Rewind(), and added a --loop command line to
            playsound for testing. Rewrote the audio callback to handle looping
diff -r 30e21a90f3b1 -r ff6e66f54ece decoders/Makefile.am
--- a/decoders/Makefile.am	Sun Jan 20 21:24:17 2002 +0000
+++ b/decoders/Makefile.am	Wed Jan 23 20:00:51 2002 +0000
@@ -2,7 +2,7 @@
 
 SUBDIRS = timidity
 
-INCLUDES = -I$(top_srcdir) -Itimidity
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/decoders/timidity
 
 libdecoders_la_SOURCES =	\
 	aiff.c		\