X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/cf714d856f8e57ec300704b665f0bbf33a4a317d..01f871b46afe3cd78e311f0344d002d844baf2b9:/server/Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 290393b..9b92ee8 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
@@ -45,7 +44,10 @@ disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBDB) $(LIBPCRE) $(LIBICONV)
 disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_speaker_SOURCES=speaker.c speaker.h
+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
@@ -103,8 +105,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