X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/d76bbdea349bf3856172ce9599e657d566e91162..99bf09c08221cf110556c1dcc3dc7a39d90c245d:/server/Makefile.am diff --git a/server/Makefile.am b/server/Makefile.am index 6062826..ede49ef 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2004-2009 Richard Kettlewell +# Copyright (C) 2004-2011, 2013 Richard Kettlewell # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,19 +16,26 @@ # along with this program. If not, see . # +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 -noinst_PROGRAMS=trackname +noinst_PROGRAMS=trackname endian +AUTOMAKE_OPTIONS=subdir-objects AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib +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 exports.c ../lib/memgc.c disorder-server.h + schedule.c dbparams.c background.c mount.c \ + exports.c disorder-server.h +nodist_disorderd_SOURCES=memgc.c disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \ - $(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \ - $(LIBASOUND) $(COREAUDIO) + $(LIBPCRE) $(LIBDB) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \ + $(LIBASOUND) $(COREAUDIO) $(LIBPTHREAD) $(LIBDL) \ + $(PULSEAUDIO_SIMPLE_LIBS) $(PULSEAUDIO_LIBS) disorderd_LDFLAGS=-export-dynamic disorderd_DEPENDENCIES=../lib/libdisorder.a @@ -40,30 +47,44 @@ disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a disorder_speaker_SOURCES=speaker.c disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \ $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO) \ - $(LIBPTHREAD) + $(LIBPTHREAD) \ + $(PULSEAUDIO_SIMPLE_LIBS) $(PULSEAUDIO_LIBS) disorder_speaker_DEPENDENCIES=../lib/libdisorder.a -disorder_decode_SOURCES=decode.c disorder-server.h +disorder_decode_SOURCES=decode.c decode.h disorder-server.h \ +decode-mp3.c decode-ogg.c decode-wav.c decode-flac.c disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \ $(LIBMAD) $(LIBVORBISFILE) $(LIBFLAC) disorder_decode_DEPENDENCIES=../lib/libdisorder.a +if GSTDECODE +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) \ + $(GSTREAMER_LIBS) $(LIBGCRYPT) $(LIBPCRE) +disorder_gstdecode_DEPENDENCIES=../lib/libdisorder.a +endif + disorder_normalize_SOURCES=normalize.c disorder-server.h disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a \ - $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) + $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(LIBSAMPLERATE) 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) + $(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) $(LIBGCRYPT) + $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) disorder_choose_LDFLAGS=-export-dynamic disorder_choose_DEPENDENCIES=../lib/libdisorder.a @@ -72,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 @@ -86,9 +109,6 @@ trackname_SOURCES=trackname.c disorder-server.h trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) trackname_DEPENDENCIES=../lib/libdisorder.a -install-exec-hook: - $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir) - check: check-help check-decode # check everything has working --help and --version @@ -116,21 +136,36 @@ 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 - echo "speaker_backend network" > config - echo "broadcast 127.255.255.255 discard" > config +check-decode: check-wav check-flac check-mp3 check-ogg + +check-mp3: disorder-decode disorder-normalize + ./disorder-decode ${top_srcdir}/sounds/scratch.mp3 | \ + ./disorder-normalize --config ${srcdir}/test-config > mp3ed.raw + $(top_srcdir)/scripts/compare-raw 64 \ + mp3ed.raw ${top_srcdir}/sounds/scratch-mp3.raw + rm -f mp3ed.raw + +check-ogg: disorder-decode disorder-normalize ./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 - -EXTRA_DIST=README.dbversions + ./disorder-normalize --config ${srcdir}/test-config > ogged.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 + $(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 + $(top_srcdir)/scripts/compare-raw 0 \ + flacced.raw ${top_srcdir}/sounds/scratch.raw + rm -f flacced.raw + +EXTRA_DIST=README.dbversions test-config CLEANFILES=*.gcda *.gcov *.gcno *.c.html index.html