Merge from uniform audio branch. disorder-playrtp now uses the uaudio

[disorder] / clients / Makefile.am

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 91d4448..5456bd1 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -33,8 +33,7 @@ disorderfm_SOURCES=disorderfm.c \
 disorderfm_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBGC) $(LIBICONV)
 disorderfm_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
-disorder_playrtp_SOURCES=playrtp.c playrtp.h playrtp-mem.c \
-                        playrtp-alsa.c playrtp-coreaudio.c playrtp-oss.c
+disorder_playrtp_SOURCES=playrtp.c playrtp.h playrtp-mem.c
 disorder_playrtp_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO) \
        $(LIBDB) $(LIBPTHREAD)