Build/packaging fixes.

icculus · Oct 12, 2003 · abb4707 · abb4707
1 parent f90871d
commit abb4707
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 11 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -6,16 +6,12 @@ libSDL_soundincludedir = $(includedir)/SDL
 libSDL_soundinclude_HEADERS =	\
 	SDL_sound.h
 
-if USE_ALTCVT
-CVT_SOURCE = alt_audio_convert.c
-else
-CVT_SOURCE = audio_convert.c
-endif
-
 libSDL_sound_la_SOURCES =	\
 	SDL_sound.c	\
 	SDL_sound_internal.h	\
-    $(CVT_SOURCE)   \
+    alt_audio_convert.c   \
+    alt_audio_convert.h  \
+    audio_convert.c   \
 	extra_rwops.c	\
 	extra_rwops.h
 
@@ -45,8 +41,12 @@ EXTRA_DIST =	\
 	CWProject.sit \
 	PBProjects.tar.gz \
 	borland.zip \
-	Doxyfile \
-    docs
+	Doxyfile
 
 dist-hook:
-	rm -rf `find $(distdir)/docs -name CVS`
+	mkdir $(distdir)/docs
+	echo "Docs are generated with the program "Doxygen" (http://www.doxygen.org/)," >> $(distdir)/docs/README
+	echo " or can be read online at http://icculus.org/SDL_sound/docs/" >> $(distdir)/docs/README
+	echo >> $(distdir)/docs/README
+	rm -rf `find $(distdir) -name "CVS" -type d`
+
diff --git a/alt_audio_convert.c b/alt_audio_convert.c
@@ -25,6 +25,12 @@
  * (This code blatantly abducted for SDL_sound. Thanks, Frank! --ryan.)
  */
 
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#if SOUND_USE_ALTCVT
+
 #include "alt_audio_convert.h"
 #include <math.h>
 
@@ -1044,3 +1050,8 @@ int Sound_BuildAudioCVT(Sound_AudioCVT *Data,
                      "return value: %d \n\n\n", ret );
     return ret;
 }
+
+#endif  /* SOUND_USE_ALTCVT */
+
+/* end of alt_audio_convert.c ... */
+
diff --git a/audio_convert.c b/audio_convert.c
@@ -31,6 +31,8 @@
 #  include <config.h>
 #endif
 
+#if !SOUND_USE_ALTCVT
+
 #include "SDL.h"
 #include "SDL_sound.h"
 
@@ -730,3 +732,8 @@ int Sound_BuildAudioCVT(Sound_AudioCVT *cvt,
 
     return(cvt->needed);
 } /* Sound_BuildAudioCVT */
+
+#endif  /* !SOUND_USE_ALTCVT */
+
+/* end of audio_convert.c ... */
+
diff --git a/configure.in b/configure.in
@@ -303,7 +303,6 @@ dnl Add Makefile conditionals
 AM_CONDITIONAL(USE_TIMIDITY, test x$enable_midi = xyes)
 AM_CONDITIONAL(USE_MPGLIB, test x$enable_mpglib = xyes)
 AM_CONDITIONAL(USE_PHYSICSFS, test x$enable_physfs = xyes)
-AM_CONDITIONAL(USE_ALTCVT, test x$enable_altcvt = xyes)
 
 AC_OUTPUT([
 Makefile

diff --git a/decoders/Makefile.am b/decoders/Makefile.am
@@ -18,4 +18,5 @@ libdecoders_la_SOURCES =	\
 	midi.c		\
 	flac.c		\
 	speex.c		\
+	quicktime.c \
 	wav.c