Merge from 3.0 fixes branch

[disorder] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 377855e9608d858cae2bb55ee09e04be7857da25..ff6253d30ca2438c5c88df48a8e99dd007bbbc15 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2007, 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,8 +18,19 @@
 # USA
 #
 
+noinst_PROGRAMS=disorder-udplog
+
+AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
+
+disorder_udplog_SOURCES=udplog.c
+disorder_udplog_LDADD=$(LIBOBJS) ../lib/libdisorder.a
+disorder_udplog_DEPENDENCIES=../lib/libdisorder.a
+
 check:
-       PATH=../server:$$PATH \
-       PYTHONPATH=../python \
-               topsrcdir=${top_srcdir} \
-               ${PYTHON} alltests
+       ${PYTHON} -u ${srcdir}/alltests
+
+clean-local:
+       rm -rf testroot *.log *.pyc
+
+EXTRA_DIST=alltests dtest.py dbversion.py search.py \
+       queue.py dump.py play.py cookie.py user-upgrade.py user.py recode.py