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

diff --git a/server/Makefile.am b/server/Makefile.am
index a2b5acf..6d497a1 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -21,27 +21,20 @@
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
 	      disorder-speaker disorder-decode disorder-normalize \
 	      disorder-stats disorder-dbupgrade disorder-choose
-noinst_PROGRAMS=disorder.cgi trackname
+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			\
-	state.c state.h					\
-	schedule.c					\
-	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) \
 	$(LIBASOUND) $(COREAUDIO)
 disorderd_LDFLAGS=-export-dynamic
 disorderd_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_deadlock_SOURCES=deadlock.c
+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
@@ -56,61 +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				\
-	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_choose_SOURCES=choose.c                        \
-	server-queue.c server-queue.h			\
-        api.c api-server.c                              \
-        exports.c					\
-	../lib/memgc.c
+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_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                           	\
-	../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 ../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=macros-disorder.c macros-disorder.h lookup.c	\
-	lookup.h options.c options.h actions.c actions.h login.c	\
-	login.h api.c							\
-	api-client.c api-client.h cgimain.c exports.c
-disorder_cgi_LDADD=../lib/libdisorder.a \
-	$(LIBPCRE) $(LIBGCRYPT) $(LIBDL) $(LIBDB)
-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
 
@@ -141,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
@@ -157,6 +137,4 @@ check-decode: disorder-decode disorder-normalize
 	cmp decoded.raw oggdec.raw
 	rm -f scratch.wav config decoded.raw oggdec.raw
 
-cgi.o: ../lib/definitions.h
-
 EXTRA_DIST=README.dbversions