summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2013-09-13 15:38:08 +0200
committerArthur de Jong <arthur@arthurdejong.org>2013-09-15 16:08:51 +0200
commit8ae8b9a17333f232f80e05479e4d7f409cc3bebb (patch)
tree9bf26c8250e09d686cb2b232dd87cd9ac3289652 /tests
parent2bd2bc470c824453cd002f151db9d668f609fc10 (diff)
Cleanups and fixes related to automake upgrade
This removes a few legacy workarounds and fixes for older versions of automake. This also removes adding specific DEBUG flags for tests since subdir objects are handled differently now.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am13
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e8a5680..0e42417 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,19 +44,14 @@ CLEANFILES = $(EXTRA_PROGRAMS)
AM_CPPFLAGS = -I$(top_srcdir)
AM_CFLAGS = $(PTHREAD_CFLAGS) -g
-# the following enables verbose protocol debugging information to be dumped
-#AM_CPPFLAGS += -DDEBUG_PROT -DDEBUG_PROT_DUMP
-
-# the following enabled verbose tio stats logging
-#AM_CPPFLAGS += -DDEBUG_TIO_STATS
-
-test_dict_SOURCES = test_dict.c ../common/dict.h ../common/dict.c
-#test_dict_LDADD = ../common/dict.o
+test_dict_SOURCES = test_dict.c ../common/dict.h
+test_dict_LDADD = ../common/libdict.a
test_set_SOURCES = test_set.c ../common/set.h
test_set_LDADD = ../common/libdict.a
-test_tio_SOURCES = test_tio.c common.h ../common/tio.h ../common/tio.c
+test_tio_SOURCES = test_tio.c common.h ../common/tio.h
+test_tio_LDADD = ../common/tio.o
test_tio_LDFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_LIBS)
test_expr_SOURCES = test_expr.c common.h