speaker process terminating is fatal

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index d15d3f4f23852c59a7578714783443d3c8e07c22..e63f6aa1966efbda29aa3debbff721cda6a8b8af 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -19,7 +19,7 @@
 #
 
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
-             disorder-speaker disorder-decode
+             disorder-speaker disorder-decode disorder-normalize
 noinst_PROGRAMS=disorder.cgi trackname
 noinst_DATA=uk.org.greenend.rjk.disorder.plist
 
@@ -54,9 +54,13 @@ disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_decode_SOURCES=decode.c
 disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBMAD)
+       $(LIBMAD) $(LIBVORBISFILE) $(LIBFLAC)
 disorder_decode_DEPENDENCIES=../lib/libdisorder.a
 
+disorder_normalize_SOURCES=normalize.c
+disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBPCRE) $(LIBICONV)
+disorder_normalize_DEPENDENCIES=../lib/libdisorder.a
+
 disorder_rescan_SOURCES=rescan.c                        \
        api.c api-server.c                              \
        trackdb.c trackdb.h exports.c                   \
@@ -106,14 +110,14 @@ include ${top_srcdir}/scripts/sedfiles.make
 EXTRA_DIST=uk.org.greenend.rjk.disorder.plist.in
 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};\
-         if [ "$$(NOLAUNCH)" != "" ]; then \
-           echo launchctl unload ${LAUNCHD} \|\| true;\
-           launchctl unload ${LAUNCHD} || true;\
-           echo launchctl load ${LAUNCHD} \|\| true;\
-           launchctl load ${LAUNCHD} || true;\
-         fi;\
-       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