Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / clients / Makefile.am

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 991554bc47252648fab360e7e6f07da491eb0cb6..b80feee04e04e87e3ea1ce2f3392257383049a3e 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006-2009 Richard Kettlewell
+# Copyright (C) 2006-2009, 2011-2013 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
@@ -16,20 +16,23 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+VPATH+=${top_srcdir}/common
+
 bin_PROGRAMS=disorder disorderfm disorder-playrtp
 noinst_PROGRAMS=filename-bytes rtpmon resample
 noinst_SCRIPTS=dump2wav
 
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
-disorder_SOURCES=disorder.c authorize.c authorize.h \
-       ../lib/memgc.c
+disorder_SOURCES=disorder.c authorize.c authorize.h
+nodist_disorder_SOURCES=memgc.c
 disorder_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
        $(LIBGC) $(LIBGCRYPT) $(LIBPCRE) $(LIBICONV) $(LIBPTHREAD)
 disorder_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
-disorderfm_SOURCES=disorderfm.c \
-       ../lib/memgc.c
+disorderfm_SOURCES=disorderfm.c
+nodist_disorderfm_SOURCES=memgc.c
 disorderfm_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBGC) $(LIBICONV)
 disorderfm_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
@@ -81,4 +84,4 @@ check-completions: disorder
 CLEANFILES=,commands ,completions \
           *.gcda *.gcov *.gcno *.c.html index.html
 
-EXTRA_DIST=dump2wav
+EXTRA_DIST=dump2wav disorder.vcxproj disorder.vcxproj.filters