Changeset 8e4aa05 for tests/Makefile.am

Timestamp:

Mar 4, 2021, 7:40:25 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

77d601f

Parents:

342af53 (diff), a5040fe (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• tests/Makefile.am (modified) (5 diffs)

tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Oct  9 23:13:07 2020
-## Update Count     : 86
+## Last Modified On : Tue Mar  2 21:39:01 2021
+## Update Count     : 90
 ###############################################################################
 
@@ -44 +44 @@
         -Wall \
         -Wno-unused-function \
-        -quiet @CFA_FLAGS@ \
-        -DIN_DIR="${abs_srcdir}/.in/"
+        -quiet @CFA_FLAGS@
 
 AM_CFAFLAGS = -XCFA --deterministic-out
@@ -76 +75 @@
         long_tests.hfa \
         .in/io.data \
+        io/.in/io.data \
         avltree/avl.h \
         avltree/avl-private.h \
@@ -142 +142 @@
 # don't use distcc to do the linking because distcc doesn't do linking
 % : %.cfa $(CFACCBIN)
-        $(CFACOMPILETEST) -c -o $(abspath ${@}).o
+        $(CFACOMPILETEST) -c -o $(abspath ${@}).o -DIN_DIR="$(abspath $(dir ${<}))/.in/"
         $(CFACCLINK) ${@}.o -o $(abspath ${@})
         rm $(abspath ${@}).o
@@ -170 +170 @@
 
 SYNTAX_ONLY_CODE = expression typedefRedef variableDeclarator switch numericConstants identFuncDeclarator forall \
-        init1 limits nested-types stdincludes cast labelledExit array builtins/sync warnings/self-assignment
+        init1 limits nested-types stdincludes cast labelledExit array quasiKeyword include/includes builtins/sync warnings/self-assignment
 $(SYNTAX_ONLY_CODE): % : %.cfa $(CFACCBIN)
         $(CFACOMPILE_SYNTAX)