X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/0b861e978d29bfa1370f149550fbac5752612a1d..6c81eef9ce2587d03f6e180963adff14b96b0337:/server/Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 9441503..75acf59 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,6 +1,6 @@
 #
 # 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
@@ -19,8 +19,9 @@
 #
 
 sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
-	      disorder-speaker
+	      disorder-speaker disorder-decode disorder-normalize
 noinst_PROGRAMS=disorder.cgi trackname
+noinst_DATA=uk.org.greenend.rjk.disorder.plist
 
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
@@ -29,48 +30,67 @@ disorderd_SOURCES=disorderd.c				\
 	daemonize.c daemonize.h				\
 	play.c play.h 					\
 	server.c server.h     				\
+	server-queue.c server-queue.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) $(LIBGCRYPT)
 disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_speaker_SOURCES=speaker.c
+disorder_speaker_SOURCES=speaker.c speaker.h \
+		         speaker-command.c \
+			 speaker-network.c \
+			 speaker-coreaudio.c \
+			 speaker-oss.c \
+			 speaker-alsa.c
 disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-	$(LIBASOUND) $(LIBGC) $(LIBPCRE)
+	$(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO)
 disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
+disorder_decode_SOURCES=decode.c
+disorder_decode_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+	$(LIBMAD) $(LIBVORBISFILE) $(LIBFLAC)
+disorder_decode_DEPENDENCIES=../lib/libdisorder.a
+
+disorder_normalize_SOURCES=normalize.c
+disorder_normalize_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+	$(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
+disorder_normalize_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) $(LIBGCRYPT)
 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) $(LIBGCRYPT)
 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) $(LIBGCRYPT)
 trackname_DEPENDENCIES=../lib/libdisorder.a
 
 install-exec-hook:
@@ -87,3 +107,21 @@ 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};\
+#	  if [ "$$(NOLAUNCH)" != "" ]; then \
+#	    echo launchctl unload ${LAUNCHD} \|\| true;\
+#	    launchctl unload ${LAUNCHD} || true;\
+#	    echo launchctl load ${LAUNCHD} \|\| true;\
+#	    launchctl load ${LAUNCHD} || true;\
+#         fi;\
+#	fi