Source code reorganization:

[disorder] / clients / Makefile.am

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 5cdb0cbac7ea4b0e71cc152b3b5ac16fc51c26d6..58316b4d1d19c51592dde49c49b0bceac3248bc2 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006 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
@@ -18,38 +18,55 @@
 # USA
 #
 
-bin_PROGRAMS=disorder disorderfm
+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
-disorder_LDADD=$(LIBOBJS) ../lib/libdisorder.la
-disorder_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.la
+disorder_SOURCES=disorder.c authorize.c authorize.h \
+       ../lib/memgc.c
+disorder_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
+       $(LIBGC) $(LIBGCRYPT) $(LIBPCRE) $(LIBDB)
+disorder_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
-disorderfm_SOURCES=disorderfm.c
-disorderfm_LDADD=$(LIBOBJS) ../lib/libdisorder.la
-disorderfm_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.la
+disorderfm_SOURCES=disorderfm.c \
+       ../lib/memgc.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_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
 
-test_eclient_SOURCES=test-eclient.c
-test_eclient_LDADD=../lib/libdisorder.la
-test_eclient_DEPENDENCIES=../lib/libdisorder.la
+test_eclient_SOURCES=test-eclient.c \
+       ../lib/memgc.c
+test_eclient_LDADD=../lib/libdisorder.a \
+       $(LIBGC) $(LIBGCRYPT) $(LIBPCRE)
+test_eclient_DEPENDENCIES=../lib/libdisorder.a
 
 install-exec-hook:
        $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
 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
@@ -67,4 +84,5 @@ check-completions:
        diff -u ,commands ,completions
 
 CLEANFILES=,commands ,completions
-# arch-tag:3wdM7iS0B+n8makCG+YcAg
+
+EXTRA_DIST=dump2wav