speaker protocol redesign to cope with libao re-opening

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 906ce98ecb8e65116466713716571421d590238c..548ac2a57b59c628b340ccfb73a44a8f52f2b0b2 100644 (file)
--- 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