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

diff --git a/server/Makefile.am b/server/Makefile.am
index 906ce98..bdb5071 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,4 +1,3 @@
-
 #
 # This file is part of DisOrder.
 # Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
@@ -20,7 +19,8 @@
 #
 
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
-	      disorder-speaker
+	      disorder-speaker disorder-decode disorder-normalize \
+	      disorder-stats
 noinst_PROGRAMS=disorder.cgi trackname
 noinst_DATA=uk.org.greenend.rjk.disorder.plist
 
@@ -31,6 +31,8 @@ disorderd_SOURCES=disorderd.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
@@ -42,28 +44,48 @@ disorderd_DEPENDENCIES=../lib/libdisorder.a
 disorder_deadlock_SOURCES=deadlock.c                    \
 	trackdb.c trackdb.h
 disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-	$(LIBDB) $(LIBPCRE) $(LIBICONV)
+	$(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_speaker_SOURCES=speaker.c
+disorder_speaker_SOURCES=speaker.c speaker.h \
+		         speaker-command.c \
+			 speaker-network.c \
+			 speaker-coreaudio.c \
+			 speaker-oss.c \
+			 speaker-alsa.c
 disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-	$(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
+	$(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO)
 disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
+disorder_decode_SOURCES=decode.c
+disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+	$(LIBMAD) $(LIBVORBISFILE) $(LIBFLAC)
+disorder_decode_DEPENDENCIES=../lib/libdisorder.a
+
+disorder_normalize_SOURCES=normalize.c
+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_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-	$(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV)
+	$(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_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)
+	$(LIBPCRE) $(LIBDB) $(LIBICONV) $(LIBGC) $(LIBGCRYPT)
 disorder_dump_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 disorder_cgi_SOURCES=dcgi.c dcgi.h			\
@@ -75,7 +97,7 @@ disorder_cgi_LDFLAGS=-export-dynamic
 disorder_cgi_DEPENDENCIES=../lib/libdisorder.a
 
 trackname_SOURCES=trackname.c
-trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV)
+trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 trackname_DEPENDENCIES=../lib/libdisorder.a
 
 install-exec-hook:
@@ -96,15 +118,17 @@ 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:
-	@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};\
-	  echo launchctl unload ${LAUNCHD} \|\| true;\
-	  launchctl unload ${LAUNCHD} || true;\
-	  echo launchctl load ${LAUNCHD} \|\| true;\
-	  launchctl load ${LAUNCHD} || true;\
-	fi
+#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