X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/c0f84b88cab9518d29900e02a9fb67776820e902..a5ecf8c2c33ea8ca44bedccdef60eb7354102f66:/server/Makefile.am?ds=sidebyside

diff --git a/server/Makefile.am b/server/Makefile.am
index 2f049ee..42dc40b 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -16,6 +16,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+VPATH+=${top_srcdir}/common
+
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
 	      disorder-speaker disorder-decode disorder-normalize \
 	      disorder-stats disorder-dbupgrade disorder-choose
@@ -28,7 +30,8 @@ AM_CFLAGS=
 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 mount.c \
-	exports.c ../lib/memgc.c disorder-server.h
+	exports.c disorder-server.h
+nodist_disorderd_SOURCES=memgc.c
 disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBPCRE) $(LIBDB) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \
 	$(LIBASOUND) $(COREAUDIO) $(LIBPTHREAD) $(LIBDL) \
@@ -59,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
 
@@ -70,14 +73,16 @@ disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 disorder_normalize_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_rescan_SOURCES=rescan.c plugin.c api.c api-server.c exports.c	\
-	../lib/memgc.c disorder-server.h
+	disorder-server.h
+nodist_disorder_rescan_SOURCES=memgc.c
 disorder_rescan_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(LIBDL)
 disorder_rescan_LDFLAGS=-export-dynamic
 disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_choose_SOURCES=choose.c server-queue.c ../lib/memgc.c	\
+disorder_choose_SOURCES=choose.c server-queue.c \
 			disorder-server.h
+nodist_disorder_choose_SOURCES=memgc.c
 disorder_choose_LDADD=$(LIBOBJS) ../lib/libdisorder.a   \
 	$(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_choose_LDFLAGS=-export-dynamic
@@ -88,12 +93,14 @@ disorder_stats_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_stats_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_dump_SOURCES=dump.c disorder-server.h ../lib/memgc.c
+disorder_dump_SOURCES=dump.c disorder-server.h
+nodist_disorder_dump_SOURCES=memgc.c
 disorder_dump_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBPCRE) $(LIBDB) $(LIBICONV) $(LIBGC) $(LIBGCRYPT)
 disorder_dump_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
-disorder_dbupgrade_SOURCES=dbupgrade.c ../lib/memgc.c disorder-server.h
+disorder_dbupgrade_SOURCES=dbupgrade.c disorder-server.h
+nodist_disorder_dbupgrade_SOURCES=memgc.c
 disorder_dbupgrade_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_dbupgrade_DEPENDENCIES=../lib/libdisorder.a
@@ -134,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 64 \
+		mp3ed.raw ${top_srcdir}/sounds/scratch-mp3.raw
 	rm -f mp3ed.raw
 
 # TODO ogg decoding comes out OK but different depending on platform, version
@@ -142,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 64 \
+		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