Changeset b5b0907 for src/Makefile.in

Timestamp:

Jun 15, 2015, 12:45:26 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

94b4364

Parents:

ea9b9d3 (diff), a1d5d2a (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc

File:

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

src/Makefile.in

@@ -392 +392 @@
 cfa_cpplibdir = ${libdir}
 cfa_cpp_SOURCES = ${SRC}
-# need files Common/utility.h and Parser/lex.h
-cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${srcdir}/Common -I${srcdir}/Parser
+# need files Common/utility.h
+cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${srcdir}/Common
 all: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) all-am