Source code reorganization:

[disorder] / clients / Makefile.am

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 784ed952503119367ff64245356a092efe8566c9..58316b4d1d19c51592dde49c49b0bceac3248bc2 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006, 2007 Richard Kettlewell
+# Copyright (C) 2006-2008 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
@@ -20,13 +20,14 @@
 
 bin_PROGRAMS=disorder disorderfm disorder-playrtp
 noinst_PROGRAMS=test-eclient filename-bytes
+noinst_SCRIPTS=dump2wav
 
 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) $(LIBDB)
 disorder_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 disorderfm_SOURCES=disorderfm.c \
@@ -34,8 +35,11 @@ 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) \
+       $(LIBDB) $(LIBPTHREAD)
 disorder_playrtp_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 filename_bytes_SOURCES=filename-bytes.c
@@ -43,7 +47,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:
@@ -51,14 +55,18 @@ install-exec-hook:
 
 check: check-help check-completions
 
-# check everything has working --help
+# check everything has working --help and --version
 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:
+check-completions: disorder
        ./disorder --help-commands \
                | awk '/^  [a-z]/ { print $$1 }' \
                | sort > ,commands
@@ -76,3 +84,5 @@ check-completions:
        diff -u ,commands ,completions
 
 CLEANFILES=,commands ,completions
+
+EXTRA_DIST=dump2wav