X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/5cd650e535068fbd115c1f26bf8a28281134ee1f..3f5b23510f628ed59c969d3d78552b956a43d32b:/server/Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 8233cff..01e769a 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004-2011 Richard Kettlewell
+# Copyright (C) 2004-2011, 2013 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 +21,7 @@ sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
 	      disorder-stats disorder-dbupgrade disorder-choose
 noinst_PROGRAMS=trackname endian
 
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
 disorderd_SOURCES=disorderd.c api.c api-server.c daemonize.c play.c	\
@@ -29,7 +30,8 @@ disorderd_SOURCES=disorderd.c api.c api-server.c daemonize.c play.c	\
 	exports.c ../lib/memgc.c disorder-server.h
 disorderd_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBPCRE) $(LIBDB) $(LIBGC) $(LIBGCRYPT) $(LIBICONV) \
-	$(LIBASOUND) $(COREAUDIO) $(LIBPTHREAD) $(LIBDL)
+	$(LIBASOUND) $(COREAUDIO) $(LIBPTHREAD) $(LIBDL) \
+	$(PULSEAUDIO_SIMPLE_LIBS) $(PULSEAUDIO_LIBS)
 disorderd_LDFLAGS=-export-dynamic
 disorderd_DEPENDENCIES=../lib/libdisorder.a
 
@@ -41,7 +43,8 @@ disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
 disorder_speaker_SOURCES=speaker.c
 disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
 	$(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO) \
-	$(LIBPTHREAD)
+	$(LIBPTHREAD) \
+	$(PULSEAUDIO_SIMPLE_LIBS) $(PULSEAUDIO_LIBS)
 disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_decode_SOURCES=decode.c decode.h disorder-server.h	\