move speaker declarations to speaker.h

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 94415030063d3e62db498a3ebdaaac31ccd96955..290393b7d19e24de9e76e0f31ccef5c381167512 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,6 +1,7 @@
+
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,6 +22,7 @@
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
              disorder-speaker
 noinst_PROGRAMS=disorder.cgi trackname
+noinst_DATA=uk.org.greenend.rjk.disorder.plist
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
@@ -30,47 +32,50 @@ disorderd_SOURCES=disorderd.c                               \
        play.c play.h                                   \
        server.c server.h                               \
        state.c state.h                                 \
-       trackdb.c trackdb.h trackdb-int.h exports.c
+       trackdb.c trackdb.h trackdb-int.h exports.c     \
+       ../lib/memgc.c
 disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT)
+       $(LIBPCRE) $(LIBDB) $(LIBAO) $(LIBGC) $(LIBGCRYPT) $(LIBICONV)
 disorderd_LDFLAGS=-export-dynamic
 disorderd_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_deadlock_SOURCES=deadlock.c                    \
        trackdb.c trackdb.h
 disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBDB) $(LIBPCRE) $(LIBGC)
+       $(LIBDB) $(LIBPCRE) $(LIBICONV)
 disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_speaker_SOURCES=speaker.c
+disorder_speaker_SOURCES=speaker.c speaker.h
 disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBASOUND) $(LIBGC) $(LIBPCRE)
+       $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_rescan_SOURCES=rescan.c                        \
        api.c api-server.c                              \
-       trackdb.c trackdb.h exports.c
+       trackdb.c trackdb.h exports.c                   \
+       ../lib/memgc.c
 disorder_rescan_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBDB) $(LIBGC) $(LIBPCRE)
+       $(LIBDB) $(LIBGC) $(LIBPCRE) $(LIBICONV)
 disorder_rescan_LDFLAGS=-export-dynamic
 disorder_rescan_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_dump_SOURCES=dump.c                           \
-        trackdb.c trackdb.h
+disorder_dump_SOURCES=dump.c                                   \
+        trackdb.c trackdb.h                            \
+       ../lib/memgc.c
 disorder_dump_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBPCRE) $(LIBDB) $(LIBGC)
+       $(LIBPCRE) $(LIBDB) $(LIBICONV) $(LIBGC)
 disorder_dump_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 disorder_cgi_SOURCES=dcgi.c dcgi.h                     \
        api.c api-client.c api-client.h                 \
        cgi.c cgi.h cgimain.c exports.c
 disorder_cgi_LDADD=../lib/libdisorder.a \
-       $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) $(LIBDL)
+       $(LIBPCRE) $(LIBGCRYPT) $(LIBDL)
 disorder_cgi_LDFLAGS=-export-dynamic
 disorder_cgi_DEPENDENCIES=../lib/libdisorder.a
 
 trackname_SOURCES=trackname.c
-trackname_LDADD=../lib/libdisorder.a $(LIBGC) $(LIBPCRE)
+trackname_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBICONV)
 trackname_DEPENDENCIES=../lib/libdisorder.a
 
 install-exec-hook:
@@ -87,3 +92,19 @@ check-help: all
        ./disorder-speaker --help > /dev/null
 
 cgi.o: ../lib/definitions.h
+
+# for Mac OS X >=10.4
+SEDFILES=uk.org.greenend.rjk.disorder.plist
+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};\
+         echo launchctl unload ${LAUNCHD} \|\| true;\
+         launchctl unload ${LAUNCHD} || true;\
+         echo launchctl load ${LAUNCHD} \|\| true;\
+         launchctl load ${LAUNCHD} || true;\
+       fi