X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/048ef912824e10c7c35efa56db6562f1da2a0169..18f94073fa55c7d32d0e84ee0d8d033a950a77b0:/server/Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index fa47023..7d59a76 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
 disorderd_SOURCES=disorderd.c api.c api-server.c daemonize.c play.c	\
 	server.c server-queue.c queue-ops.c state.c plugin.c		\
-	schedule.c dbparams.c background.c \
+	schedule.c dbparams.c background.c mount.c \
 	exports.c ../lib/memgc.c disorder-server.h
 disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \
@@ -117,29 +117,31 @@ check-help: all
 	./disorder-choose --help > /dev/null
 	./disorder-choose --version > /dev/null
 
-check-decode: check-ogg check-wav check-flac check-mp3
+check-decode: check-wav check-flac check-mp3
 
 check-mp3: disorder-decode disorder-normalize
 	./disorder-decode ${top_srcdir}/sounds/scratch.mp3 | \
-	  ./disorder-normalize --config test-config > mp3ed.raw
+	  ./disorder-normalize --config ${srcdir}/test-config > mp3ed.raw
 	cmp mp3ed.raw ${top_srcdir}/sounds/scratch-mp3.raw
 	rm -f mp3ed.raw
 
+# TODO ogg decoding comes out OK but different depending on platform, version
+# or something.  Makes it tricky to test!
 check-ogg: disorder-decode disorder-normalize
 	./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
-	  ./disorder-normalize --config test-config > ogged.raw
+	  ./disorder-normalize --config ${srcdir}/test-config > ogged.raw
 	cmp ogged.raw ${top_srcdir}/sounds/scratch.raw
 	rm -f ogged.raw
 
 check-wav: disorder-decode disorder-normalize
 	./disorder-decode ${top_srcdir}/sounds/scratch.wav | \
-	  ./disorder-normalize --config test-config > waved.raw
+	  ./disorder-normalize --config ${srcdir}/test-config > waved.raw
 	cmp waved.raw ${top_srcdir}/sounds/scratch.raw
 	rm -rf waved.raw
 
 check-flac: disorder-decode disorder-normalize
 	./disorder-decode ${top_srcdir}/sounds/scratch.flac | \
-	  ./disorder-normalize --config test-config > flacced.raw
+	  ./disorder-normalize --config ${srcdir}/test-config > flacced.raw
 	cmp flacced.raw ${top_srcdir}/sounds/scratch.raw
 	rm -f flacced.raw