merge RTP branch

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 290393b..92f3de2 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -45,7 +45,10 @@ disorder_deadlock_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBDB) $(LIBPCRE) $(LIBICONV)
 disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
 
-disorder_speaker_SOURCES=speaker.c speaker.h
+disorder_speaker_SOURCES=speaker.c speaker.h \
+                        speaker-command.c \
+                        speaker-network.c \
+                        speaker-alsa.c
 disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT)
 disorder_speaker_DEPENDENCIES=../lib/libdisorder.a