Split up tracklength module into separate files for each file format.

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 358d2cc9757d1146143bc147ac7eb0146c5695fe..fc7e1d9cf537992cd407f63208d7e1e042c0b9de 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -117,30 +117,31 @@ check-help: all
        ./disorder-choose --help > /dev/null
        ./disorder-choose --version > /dev/null
 
-check-decode: check-ogg check-wav check-flac
+check-decode: check-wav check-flac check-mp3
 
-# TODO!
 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