X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/3e1d9716f4d63814a7df129ad7d99c98865e8385..63b86f2dd86f7c263c9e414314bf516895d61c6b:/server/Makefile.am?ds=sidebyside

diff --git a/server/Makefile.am b/server/Makefile.am
index bd17ea9..2447485 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -62,8 +62,8 @@ AM_CFLAGS+=$(GSTREAMER_CFLAGS)
 sbin_PROGRAMS+=disorder-gstdecode
 disorder_gstdecode_SOURCES=gstdecode.c disorder-server.h
 disorder_gstdecode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-	$(GSTREAMER_PLUGINS_BASE_LIBS) -lgstaudio-0.10 -lgstapp-0.10 \
-	$(GSTREAMER_LIBS) $(LIBGCRYPT)
+	$(GSTREAMER_PLUGINS_BASE_LIBS) \
+	$(GSTREAMER_LIBS) $(LIBGCRYPT) $(LIBPCRE)
 disorder_gstdecode_DEPENDENCIES=../lib/libdisorder.a
 endif
 
@@ -141,7 +141,8 @@ check-decode: check-wav check-flac check-mp3
 check-mp3: disorder-decode disorder-normalize
 	./disorder-decode ${top_srcdir}/sounds/scratch.mp3 | \
 	  ./disorder-normalize --config ${srcdir}/test-config > mp3ed.raw
-	cmp mp3ed.raw ${top_srcdir}/sounds/scratch-mp3.raw
+	$(top_srcdir)/scripts/compare-raw 0 \
+		mp3ed.raw ${top_srcdir}/sounds/scratch-mp3.raw
 	rm -f mp3ed.raw
 
 # TODO ogg decoding comes out OK but different depending on platform, version
@@ -149,19 +150,22 @@ check-mp3: disorder-decode disorder-normalize
 check-ogg: disorder-decode disorder-normalize
 	./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
 	  ./disorder-normalize --config ${srcdir}/test-config > ogged.raw
-	cmp ogged.raw ${top_srcdir}/sounds/scratch.raw
+	$(top_srcdir)/scripts/compare-raw 0 \
+		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 ${srcdir}/test-config > waved.raw
-	cmp waved.raw ${top_srcdir}/sounds/scratch.raw
+	$(top_srcdir)/scripts/compare-raw 0 \
+		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 ${srcdir}/test-config > flacced.raw
-	cmp flacced.raw ${top_srcdir}/sounds/scratch.raw
+	$(top_srcdir)/scripts/compare-raw 0 \
+		flacced.raw ${top_srcdir}/sounds/scratch.raw
 	rm -f flacced.raw
 
 EXTRA_DIST=README.dbversions test-config