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

diff --git a/server/Makefile.am b/server/Makefile.am
index 906ce98..548ac2a 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,7 @@
 #
 
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
-	      disorder-speaker
+	      disorder-speaker disorder-decode disorder-normalize
 noinst_PROGRAMS=disorder.cgi trackname
 noinst_DATA=uk.org.greenend.rjk.disorder.plist
 
@@ -45,11 +44,23 @@ disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBDB) $(LIBPCRE) $(LIBICONV)
 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-alsa.c
 disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
+disorder_decode_SOURCES=decode.c
+disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+	$(LIBMAD)
+disorder_decode_DEPENDENCIES=../lib/libdisorder.a
+
+disorder_normalize_SOURCES=normalize.c
+disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBPCRE)
+disorder_normalize_DEPENDENCIES=../lib/libdisorder.a
+
 disorder_rescan_SOURCES=rescan.c                        \
 	api.c api-server.c				\
 	trackdb.c trackdb.h exports.c			\
@@ -103,8 +114,10 @@ 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;\
+	  if [ "$$(NOLAUNCH)" != "" ]; then \
+	    echo launchctl unload ${LAUNCHD} \|\| true;\
+	    launchctl unload ${LAUNCHD} || true;\
+	    echo launchctl load ${LAUNCHD} \|\| true;\
+	    launchctl load ${LAUNCHD} || true;\
+         fi;\
 	fi