Changeset b726084 for src/driver/Makefile.am

Timestamp:

Nov 9, 2016, 2:51:42 PM (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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

30b65d8, d073e3c

Parents:

141b786 (diff), 84118d8 (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 tuples

Conflicts:

src/ControlStruct/LabelTypeChecker.cc
src/InitTweak/FixInit.cc
src/ResolvExpr/Resolver.cc
src/Tuples/TupleAssignment.cc
src/Tuples/TupleAssignment.h

File:

• src/driver/Makefile.am (modified) (2 diffs)

src/driver/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:49:31 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Jan 28 09:04:40 2016
-## Update Count     : 7
+## Last Modified On : Fri Oct 28 13:46:06 2016
+## Update Count     : 10
 ###############################################################################
 
@@ -26 +26 @@
 cc1_SOURCES = cc1.cc
 
-cfa.cc : ${abs_top_srcdir}/version
-        @true
-
 MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}