Changes in src/tests/Makefile.am [b8f6002:e68b3a8]

File:

• src/tests/Makefile.am (modified) (3 diffs)

src/tests/Makefile.am

@@ -29 +29 @@
 
 # applies to both programs
-AM_CFLAGS = $(if $(test), 2> $(test), ) \
-        -XCFA \
-        -t \
-        -B${abs_top_builddir}/src/driver \
-        -g \
-        -Wall \
-        -Wno-unused-function \
-        -quiet @CFA_FLAGS@ \
-        -I. \
-        -DIN_DIR="${srcdir}/.in/" \
-        -L${abs_top_builddir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa/containers \
-        -I${abs_top_srcdir}/src/libcfa/concurrency \
-        -I${abs_top_srcdir}/src/libcfa/stdhdr
+DEBUG_FLAGS =
 
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I.
 if !BUILD_DEBUG
-AM_CFLAGS += -nodebug
+BUILD_FLAGS += -nodebug
 else
 if !BUILD_RELEASE
-AM_CFLAGS += -debug
+BUILD_FLAGS += -debug
 else
-AM_CFLAGS += ${DEBUG_FLAGS}
+BUILD_FLAGS += ${DEBUG_FLAGS}
 endif
 endif
 
-CC = ${abs_top_builddir}/src/driver/cfa
+TEST_FLAGS = $(if $(test), 2> $(test), )
+AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
+CC = ${abs_top_builddir}/src/driver/cfa -DIN_DIR="${srcdir}/.in/"
 
 .PHONY : list
@@ -61 +50 @@
 
 fstream_test_SOURCES = fstream_test.c
+fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 
 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
+avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS}
 
 all-local :
@@ -79 +70 @@
         @+${TEST_PY} --debug=${debug} -Iconcurrent
 
-% : %.c $(CC)
+% : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) $(abspath ${<}) -o ${@}
 
-declarationSpecifier: declarationSpecifier.c $(CC)
+declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-gccExtensions : gccExtensions.c $(CC)
+gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-extension : extension.c $(CC)
+extension : extension.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-attributes : attributes.c $(CC)
+attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-functions: functions.c $(CC)
+functions: functions.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-KRfunctions : KRfunctions.c $(CC)
+KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-sched-ext-parse : sched-ext-parse.c $(CC)
+sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@}
 
-gmp : gmp.c $(CC)
+gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -lgmp $(abspath ${<}) -o ${@}
 
-completeTypeError : completeTypeError.c $(CC)
+completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-typedefRedef-ERR1: typedefRedef.c $(CC)
+typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-alloc-ERROR: alloc.c $(CC)
+alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-fallthrough-ERROR: fallthrough.c $(CC)
+fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-nested-types-ERR1: nested-types.c $(CC)
+nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-nested-types-ERR2: nested-types.c $(CC)
+nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
 # Constructor/destructor tests
-raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC)
+raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC)
+raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR2 $(abspath ${<}) -o ${@}
 
-raii/memberCtors-ERR1: raii/memberCtors.c $(CC)
+raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
-raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC)
+raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) -DERR1 $(abspath ${<}) -o ${@}
 
 # Warnings
-warnings/self-assignment: warnings/self-assignment.c $(CC)
+warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only
 
 #builtins
-builtins/sync: builtins/sync.c $(CC)
+builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@
         $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only