X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/5fa6c4f8d6851c12efe73278f32d0b464c6d054f..d8b957853160200fe6b00d8c0e8c61a3f62ecd7c:/server/Makefile.am diff --git a/server/Makefile.am b/server/Makefile.am index eae90c6..6d497a1 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -1,6 +1,6 @@ # # This file is part of DisOrder. -# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell +# Copyright (C) 2004-2008 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 @@ -20,29 +20,21 @@ sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \ disorder-speaker disorder-decode disorder-normalize \ - disorder-stats disorder-dbupgrade -noinst_PROGRAMS=disorder.cgi trackname -noinst_DATA=uk.org.greenend.rjk.disorder.plist + disorder-stats disorder-dbupgrade disorder-choose +noinst_PROGRAMS=trackname AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib -disorderd_SOURCES=disorderd.c \ - api.c api-server.c \ - daemonize.c daemonize.h \ - play.c play.h \ - server.c server.h \ - server-queue.c server-queue.h \ - setup.c setup.h \ - state.c state.h \ - trackdb.c trackdb.h trackdb-int.h exports.c \ - ../lib/memgc.c +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 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-server.h disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \ $(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a @@ -57,51 +49,46 @@ disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \ $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO) disorder_speaker_DEPENDENCIES=../lib/libdisorder.a -disorder_decode_SOURCES=decode.c +disorder_decode_SOURCES=decode.c disorder-server.h disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \ $(LIBMAD) $(LIBVORBISFILE) $(LIBFLAC) disorder_decode_DEPENDENCIES=../lib/libdisorder.a -disorder_normalize_SOURCES=normalize.c +disorder_normalize_SOURCES=normalize.c disorder-server.h disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a \ $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) disorder_normalize_DEPENDENCIES=../lib/libdisorder.a -disorder_rescan_SOURCES=rescan.c \ - api.c api-server.c \ - trackdb.c trackdb.h exports.c \ - ../lib/memgc.c +disorder_rescan_SOURCES=rescan.c plugin.c api.c api-server.c exports.c \ + ../lib/memgc.c disorder-server.h 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 trackdb.c trackdb.h +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) +disorder_choose_LDFLAGS=-export-dynamic +disorder_choose_DEPENDENCIES=../lib/libdisorder.a + +disorder_stats_SOURCES=stats.c disorder-server.h 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_SOURCES=dump.c disorder-server.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 trackdb.c trackdb.h ../lib/memgc.c +disorder_dbupgrade_SOURCES=dbupgrade.c ../lib/memgc.c disorder-server.h 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) -disorder_cgi_LDFLAGS=-export-dynamic -disorder_cgi_DEPENDENCIES=../lib/libdisorder.a - -trackname_SOURCES=trackname.c +trackname_SOURCES=trackname.c disorder-server.h trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) trackname_DEPENDENCIES=../lib/libdisorder.a @@ -132,6 +119,8 @@ check-help: all ./disorder-dbupgrade --version > /dev/null ./disorder-rescan --help > /dev/null ./disorder-rescan --version > /dev/null + ./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 @@ -144,25 +133,8 @@ check-decode: disorder-decode disorder-normalize 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 README.dbversions -LAUNCHD=/Library/LaunchDaemons - -#install-data-hook: -# @if [ -d ${LAUNCHD} ]; then \ -# echo $(INSTALL) -m 644 uk.org.greenend.rjk.disorder.plist ${LAUNCHD};\ -# $(INSTALL) -m 644 uk.org.greenend.rjk.disorder.plist ${LAUNCHD};\ -# if [ "$$(NOLAUNCH)" != "" ]; then \ -# echo launchctl unload ${LAUNCHD} \|\| true;\ -# launchctl unload ${LAUNCHD} || true;\ -# echo launchctl load ${LAUNCHD} \|\| true;\ -# launchctl load ${LAUNCHD} || true;\ -# fi;\ -# fi +EXTRA_DIST=README.dbversions