X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/572c28992641c1fc82a3d3218ece737a078390a0..2a6c7b7954660db70734a4485981864498f80155:/server/Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index fef174e..e63f6aa 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -54,11 +54,11 @@ disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_decode_SOURCES=decode.c
 disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-	$(LIBMAD) $(LIBVORBISFILE)
+	$(LIBMAD) $(LIBVORBISFILE) $(LIBFLAC)
 disorder_decode_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_normalize_SOURCES=normalize.c
-disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBPCRE)
+disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBPCRE) $(LIBICONV)
 disorder_normalize_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_rescan_SOURCES=rescan.c                        \
@@ -110,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