Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 25a9b5adefaebb173fab189e8ba954167858e6b7)
+++ tests/Makefile.am	(revision c59712ef719214c06c49604e482d89f51c7745d4)
@@ -20,9 +20,5 @@
 quick_test=avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
 
-if BUILD_CONCURRENCY
 concurrent=
-else
-concurrent='-Econcurrent'
-endif
 
 TEST_PY = python ${srcdir}/test.py
@@ -37,13 +33,5 @@
 	@BUILD_IN_TREE_FLAGS@
 
-if !BUILD_DEBUG
-AM_CFLAGS += -nodebug
-else
-if !BUILD_RELEASE
-AM_CFLAGS += -debug
-else
 AM_CFLAGS += ${DEBUG_FLAGS}
-endif
-endif
 
 CC = @CFACC@
Index: tests/Makefile.in
===================================================================
--- tests/Makefile.in	(revision 25a9b5adefaebb173fab189e8ba954167858e6b7)
+++ tests/Makefile.in	(revision c59712ef719214c06c49604e482d89f51c7745d4)
@@ -91,7 +91,4 @@
 build_triplet = @build@
 host_triplet = @host@
-@BUILD_DEBUG_FALSE@am__append_1 = -nodebug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_FALSE@am__append_2 = -debug
-@BUILD_DEBUG_TRUE@@BUILD_RELEASE_TRUE@am__append_3 = ${DEBUG_FLAGS}
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) avl_test$(EXEEXT)
 subdir = tests
@@ -222,8 +219,9 @@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MACHINE_TYPE = @MACHINE_TYPE@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -241,4 +239,5 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@
@@ -298,6 +297,5 @@
 debug = yes
 quick_test = avl_test operators numericConstants expression enum array typeof cast raii/dtor-early-exit raii/init_once attributes
-@BUILD_CONCURRENCY_FALSE@concurrent = '-Econcurrent'
-@BUILD_CONCURRENCY_TRUE@concurrent = 
+concurrent = 
 TEST_PY = python ${srcdir}/test.py
 
@@ -305,6 +303,5 @@
 AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
 	-quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \
-	@BUILD_IN_TREE_FLAGS@ $(am__append_1) $(am__append_2) \
-	$(am__append_3)
+	@BUILD_IN_TREE_FLAGS@ ${DEBUG_FLAGS}
 fstream_test_SOURCES = fstream_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
Index: tests/preempt_longrun/Makefile.in
===================================================================
--- tests/preempt_longrun/Makefile.in	(revision 25a9b5adefaebb173fab189e8ba954167858e6b7)
+++ tests/preempt_longrun/Makefile.in	(revision c59712ef719214c06c49604e482d89f51c7745d4)
@@ -378,8 +378,9 @@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
+LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MACHINE_TYPE = @MACHINE_TYPE@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
@@ -397,4 +398,5 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
+TARGET_HOSTS = @TARGET_HOSTS@
 VERSION = @VERSION@
 YACC = @YACC@