more automation of test logic

[disorder] / clients / Makefile.am

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 784ed952503119367ff64245356a092efe8566c9..880f86ae5368438f15688c3a694652c9882a558e 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -26,7 +26,7 @@ AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 disorder_SOURCES=disorder.c authorize.c authorize.h \
        ../lib/memgc.c
 disorder_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-       $(LIBDL) $(LIBGC) $(LIBGCRYPT) $(LIBPCRE)
+       $(LIBGC) $(LIBGCRYPT) $(LIBPCRE)
 disorder_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 disorderfm_SOURCES=disorderfm.c \
@@ -34,8 +34,10 @@ disorderfm_SOURCES=disorderfm.c \
 disorderfm_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBGC) $(LIBICONV)
 disorderfm_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
-disorder_playrtp_SOURCES=playrtp.c
-disorder_playrtp_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBASOUND)
+disorder_playrtp_SOURCES=playrtp.c playrtp.h playrtp-mem.c \
+                        playrtp-alsa.c playrtp-coreaudio.c playrtp-oss.c
+disorder_playrtp_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+       $(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO)
 disorder_playrtp_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 filename_bytes_SOURCES=filename-bytes.c
@@ -43,7 +45,7 @@ filename_bytes_SOURCES=filename-bytes.c
 test_eclient_SOURCES=test-eclient.c \
        ../lib/memgc.c
 test_eclient_LDADD=../lib/libdisorder.a \
-       $(LIBDL) $(LIBGC) $(LIBGCRYPT) $(LIBPCRE)
+       $(LIBGC) $(LIBGCRYPT) $(LIBPCRE)
 test_eclient_DEPENDENCIES=../lib/libdisorder.a
 
 install-exec-hook:
@@ -56,6 +58,10 @@ check-help: all
        ./disorder --version > /dev/null
        ./disorder --help > /dev/null
        ./disorder --help-commands > /dev/null
+       ./disorderfm --version > /dev/null
+       ./disorderfm --help > /dev/null
+       ./disorder-playrtp --version > /dev/null
+       ./disorder-playrtp --help > /dev/null
 
 # check that the command completions are up to date
 check-completions: