Changeset 1f6d4624 for src/tests/Makefile.in

Timestamp:

Aug 16, 2016, 3:23:20 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

c09e4bc

Parents:

13e3b50 (diff), 7527e63 (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

Conflicts:

src/tests/.expect/declarationSpecifier.txt

File:

• src/tests/Makefile.in (modified) (1 diff)

src/tests/Makefile.in

@@ -661 +661 @@
         ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
 
+declarationSpecifier: declarationSpecifier.c
+        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
+
 gccExtensions : gccExtensions.c
         ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}