Changeset 4084928e for src/tests/Makefile.am

Timestamp:

Aug 6, 2018, 9:02:25 AM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

f47d0ad

Parents:

364d70c (diff), f271bdd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into demangler

File:

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

src/tests/Makefile.am

@@ -30 +30 @@
 # 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
+        @BUILD_IN_TREE_FLAGS@
 
 if !BUILD_DEBUG
@@ -55 +47 @@
 endif
 
-CC = ${abs_top_builddir}/src/driver/cfa
+CC = @CFACC@
 
 .PHONY : list
@@ -93 +85 @@
 # implicit rule so not all test require a rule
 % : %.c $(CC)
-        echo $(headers_deps)
         $(COMPILE) $(abspath ${<}) -o ${@}