X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/e99d42b153659e7ac644bb93700acb81514998e5..91370169de7f552f3a54e5ef9e079a202a5efbfa:/server/Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 8fc3dfe..eca95c4 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -19,7 +19,8 @@
 #
 
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
-	      disorder-speaker disorder-decode disorder-normalize
+	      disorder-speaker disorder-decode disorder-normalize \
+	      disorder-stats disorder-dbupgrade
 noinst_PROGRAMS=disorder.cgi trackname
 noinst_DATA=uk.org.greenend.rjk.disorder.plist
 
@@ -30,16 +31,17 @@ disorderd_SOURCES=disorderd.c				\
 	daemonize.c daemonize.h				\
 	play.c play.h 					\
 	server.c server.h     				\
+	server-queue.c server-queue.h			\
 	state.c state.h					\
-	trackdb.c trackdb.h trackdb-int.h exports.c 	\
+	exports.c 					\
 	../lib/memgc.c
 disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-	$(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT) $(LIBICONV)
+	$(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \
+	$(LIBASOUND) $(COREAUDIO)
 disorderd_LDFLAGS=-export-dynamic
 disorderd_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_deadlock_SOURCES=deadlock.c                    \
-	trackdb.c trackdb.h
+disorder_deadlock_SOURCES=deadlock.c
 disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
@@ -66,25 +68,34 @@ disorder_normalize_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_rescan_SOURCES=rescan.c                        \
 	api.c api-server.c				\
-	trackdb.c trackdb.h exports.c			\
+	exports.c			                \
 	../lib/memgc.c
 disorder_rescan_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_rescan_LDFLAGS=-export-dynamic
 disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 
+disorder_stats_SOURCES=stats.c
+disorder_stats_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+	$(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
+disorder_stats_DEPENDENCIES=../lib/libdisorder.a
+
 disorder_dump_SOURCES=dump.c                           	\
-        trackdb.c trackdb.h				\
 	../lib/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_dbupgrade_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+	$(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
+disorder_dbupgrade_DEPENDENCIES=../lib/libdisorder.a
+
 disorder_cgi_SOURCES=dcgi.c dcgi.h			\
 	api.c api-client.c api-client.h			\
 	cgi.c cgi.h cgimain.c exports.c
 disorder_cgi_LDADD=../lib/libdisorder.a \
-	$(LIBPCRE) $(LIBGCRYPT) $(LIBDL)
+	$(LIBPCRE) $(LIBGCRYPT) $(LIBDL) $(LIBDB)
 disorder_cgi_LDFLAGS=-export-dynamic
 disorder_cgi_DEPENDENCIES=../lib/libdisorder.a
 
@@ -95,22 +106,52 @@ trackname_DEPENDENCIES=../lib/libdisorder.a
 install-exec-hook:
 	$(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
-check: check-help
+check: check-help check-decode
 
-# check everything has working --help
+# check everything has working --help and --version
 check-help: all
 	./disorderd --help > /dev/null
+	./disorderd --version > /dev/null
 	./disorder-dump --help > /dev/null
+	./disorder-dump --version > /dev/null
 	./disorder-deadlock --help > /dev/null
+	./disorder-deadlock --version > /dev/null
 	./trackname --help > /dev/null
+	./trackname --version > /dev/null
 	./disorder-speaker --help > /dev/null
+	./disorder-speaker --version > /dev/null
+	./disorder-decode --help > /dev/null
+	./disorder-decode --version > /dev/null
+	./disorder-normalize --help > /dev/null
+	./disorder-normalize --version > /dev/null
+	./disorder-stats --help > /dev/null
+	./disorder-stats --version > /dev/null
+	./disorder-dbupgrade --help > /dev/null
+	./disorder-dbupgrade --version > /dev/null
+	./disorder-rescan --help > /dev/null
+	./disorder-rescan --version > /dev/null
+
+# My sox doesn't know MP3 or FLAC unfortunately
+check-decode: disorder-decode disorder-normalize
+	echo "speaker_backend network" > config
+	echo "broadcast 127.255.255.255 discard" > config
+	./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
+	  ./disorder-normalize --config config > decoded.raw
+	oggdec -b 16 -e 1 -R -s 1 -o oggdec.raw ${top_srcdir}/sounds/scratch.ogg
+	cmp decoded.raw oggdec.raw
+	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
 
 cgi.o: ../lib/definitions.h
 
 # for Mac OS X >=10.4
 SEDFILES=uk.org.greenend.rjk.disorder.plist
 include ${top_srcdir}/scripts/sedfiles.make
-EXTRA_DIST=uk.org.greenend.rjk.disorder.plist.in
+EXTRA_DIST=uk.org.greenend.rjk.disorder.plist.in README.dbversions
 LAUNCHD=/Library/LaunchDaemons
 
 #install-data-hook: