update plumbing diagram

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index fef174e98bdee300749aed0f5c078d47d5b6dcd9..2b655956128aada719294b48f18fd1a5cb932c42 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -41,7 +41,7 @@ disorderd_DEPENDENCIES=../lib/libdisorder.a
 disorder_deadlock_SOURCES=deadlock.c                    \
        trackdb.c trackdb.h
 disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBDB) $(LIBPCRE) $(LIBICONV)
+       $(LIBDB) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_speaker_SOURCES=speaker.c speaker.h \
@@ -54,11 +54,12 @@ 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) $(LIBGCRYPT)
 disorder_normalize_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_rescan_SOURCES=rescan.c                        \
@@ -66,7 +67,7 @@ disorder_rescan_SOURCES=rescan.c                        \
        trackdb.c trackdb.h exports.c                   \
        ../lib/memgc.c
 disorder_rescan_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV)
+       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_rescan_LDFLAGS=-export-dynamic
 disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 
@@ -74,7 +75,7 @@ disorder_dump_SOURCES=dump.c                                  \
         trackdb.c trackdb.h                            \
        ../lib/memgc.c
 disorder_dump_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBPCRE) $(LIBDB) $(LIBICONV) $(LIBGC)
+       $(LIBPCRE) $(LIBDB) $(LIBICONV) $(LIBGC) $(LIBGCRYPT)
 disorder_dump_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 disorder_cgi_SOURCES=dcgi.c dcgi.h                     \
@@ -86,7 +87,7 @@ disorder_cgi_LDFLAGS=-export-dynamic
 disorder_cgi_DEPENDENCIES=../lib/libdisorder.a
 
 trackname_SOURCES=trackname.c
-trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV)
+trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 trackname_DEPENDENCIES=../lib/libdisorder.a
 
 install-exec-hook:
@@ -110,14 +111,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