X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f2620548144b356661614eba36c9de12ef31395c..05fd0aa117566503026dbedfe4d9b0485da2d5ed:/tests/Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5563f7f..cab7004 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2007-2009 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2007-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,19 +16,23 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+VPATH+=${top_srcdir}/common
+
 noinst_PROGRAMS=disorder-udplog
 
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
-disorder_udplog_SOURCES=udplog.c ../lib/memgc.c
+disorder_udplog_SOURCES=udplog.c
+nodist_disorder_udplog_SOURCES=memgc.c
 disorder_udplog_LDADD=$(LIBOBJS) ../lib/libdisorder.a $(LIBGC)
 disorder_udplog_DEPENDENCIES=../lib/libdisorder.a
 
 TESTS=cookie.py dbversion.py dump.py files.py play.py queue.py	\
-	recode.py search.py user-upgrade.py user.py aliases.py	\
+	recode.py search.py user.py aliases.py	\
 	schedule.py hashes.py playlists.py
 
-TESTS_ENVIRONMENT=${PYTHON} -u
+AM_TESTS_ENVIRONMENT=PYTHONUNBUFFERED=true;export PYTHONUNBUFFERED;
 
 clean-local:
 	rm -rf testroot *.log *.pyc