Add missing -liconv in various places.

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 4b860c4da8286a17c288dd7c27eb5e85a3d8dc0c..f67db97b37b52fc37964ec0316325abaf65c3605 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -64,7 +64,7 @@ disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 disorder_choose_SOURCES=choose.c server-queue.c ../lib/memgc.c \
                        disorder-server.h
 disorder_choose_LDADD=$(LIBOBJS) ../lib/libdisorder.a   \
-       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBGCRYPT)
+       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_choose_LDFLAGS=-export-dynamic
 disorder_choose_DEPENDENCIES=../lib/libdisorder.a
 
@@ -117,20 +117,38 @@ check-help: all
        ./disorder-choose --help > /dev/null
        ./disorder-choose --version > /dev/null
 
-# My sox doesn't know MP3 or FLAC unfortunately
 check-decode: disorder-decode disorder-normalize endian
        echo "speaker_backend network" > config
        echo "broadcast 127.255.255.255 9" > config
-       ./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
-         ./disorder-normalize --config config > decoded.raw
        oggdec -b 16 -e `./endian` -R -s 1 -o oggdec.raw ${top_srcdir}/sounds/scratch.ogg
-       cmp decoded.raw oggdec.raw
+       @$(MAKE) check-ogg
+       @$(MAKE) check-wav
+       @if which flac >/dev/null 2>&1; then $(MAKE) check-flac; fi
+       rm -f config oggdec.raw
+
+# TODO mp3 - but sox doesn't (reliably) know how to encode to it
+
+check-ogg:
+       ./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
+         ./disorder-normalize --config config > ogged.raw
+       cmp ogged.raw oggdec.raw
+       rm -f ogged.raw
+
+check-wav:
        sox ${top_srcdir}/sounds/scratch.ogg scratch.wav
        ./disorder-decode scratch.wav | \
-         ./disorder-normalize --config config > decoded.raw
-       ls -l *.raw
-       cmp decoded.raw oggdec.raw
-       rm -f scratch.wav config decoded.raw oggdec.raw
+         ./disorder-normalize --config config > waved.raw
+       cmp waved.raw oggdec.raw
+       rm -rf scratch.wav waved.raw
+
+check-flac:
+       rm -f scratch.wav scratch.flac
+       sox ${top_srcdir}/sounds/scratch.ogg scratch.wav
+       flac scratch.wav
+       ./disorder-decode scratch.flac | \
+         ./disorder-normalize --config config > flacced.raw
+       cmp flacced.raw oggdec.raw
+       rm -f scratch.flac scratch.wav flacced.raw
 
 EXTRA_DIST=README.dbversions