Changeset 3bbd012 for src/Makefile.am

Timestamp:

Jul 31, 2018, 2:43:04 PM (6 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:

642bc83

Parents:

d1e0979 (diff), 04e367c (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/Makefile.am (modified) (6 diffs)

src/Makefile.am

@@ -19 +19 @@
 
 SRC = main.cc \
-      MakeLibCfa.cc
+      MakeLibCfa.cc \
+      CompilationState.cc
 
 MAINTAINERCLEANFILES =
@@ -37 +38 @@
 include SynTree/module.mk
 include Tuples/module.mk
+include Validate/module.mk
 include Virtual/module.mk
 
@@ -45 +47 @@
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = -ldl                     # yywrap
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I${abs_top_srcdir}/src/Parser -I${abs_top_srcdir}/src/include -DYY_NO_INPUT -O2 -g -std=c++14
 driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
 
@@ -91 +93 @@
   SynTree/Attribute.cc \
   SynTree/DeclReplacer.cc \
+  CompilationState.cc \
   CodeGen/CodeGenerator.cc \
   CodeGen/FixMain.cc \
@@ -96 +99 @@
   CodeGen/OperatorTable.cc \
   Common/Assert.cc \
+  Common/Eval.cc \
   Common/SemanticError.cc \
   Common/UniqueName.cc \
@@ -134 +138 @@
   Tuples/Explode.cc \
   Tuples/TupleAssignment.cc \
-  Tuples/TupleExpansion.cc
+  Tuples/TupleExpansion.cc \
+  Validate/HandleAttributes.cc
 
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}