Changeset d63eeb0 for src/Makefile.am

Timestamp:

Feb 9, 2016, 3:25:05 PM (8 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, with_gc

Children:

7528ba1

Parents:

771b3c3 (diff), bd85400 (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 ctor

Conflicts:

src/CodeGen/CodeGenerator.cc
src/GenPoly/Box.cc
src/Makefile.in
src/Parser/ParseNode.h
src/Parser/parser.cc
src/Parser/parser.yy
src/SymTab/Validate.cc
src/SynTree/Initializer.h
src/SynTree/ObjectDecl.cc
src/SynTree/Visitor.h
src/main.cc

File:

• src/Makefile.am (modified) (3 diffs)

src/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:51:46 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Jun 13 08:22:14 2015
-## Update Count     : 17
+## Last Modified On : Thu Jan 28 16:50:26 2016
+## Update Count     : 55
 ###############################################################################
 
@@ -18 +18 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
-SRC = main.cc MakeLibCfa.cc
+SRC = main.cc \
+      MakeLibCfa.cc
+
+MAINTAINERCLEANFILES =
 
 # Is there a way to use a variable for the directory names?
+
 include ArgTweak/module.mk
 include CodeGen/module.mk
@@ -36 +40 @@
 # put into lib for now
 cfa_cpplibdir = ${libdir}
-cfa_cpplib_PROGRAMS = cfa-cpp
-cfa_cpp_SOURCES = ${SRC}
+cfa_cpplib_PROGRAMS = driver/cfa-cpp
+driver_cfa_cpp_SOURCES = ${SRC}
+driver_cfa_cpp_LDADD = ${LEXLIB}        # yywrap
 # need files Common/utility.h
-cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -I${srcdir}/Common
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL
 
 CXXFLAGS = -g   # remove default -O2 to allow better debugging
+
+MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}