Changeset cdbab55 for src/Makefile.am

Timestamp:

Aug 21, 2018, 2:24:29 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6a (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:/u/cforall/software/cfa/cfa-cc

File:

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

src/Makefile.am

@@ -16 +16 @@
 
 # create object files in directory with source files
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = foreign subdir-objects
 
 SRC = main.cc \
@@ -23 +23 @@
 
 MAINTAINERCLEANFILES =
+MOSTLYCLEANFILES =
 
 # Is there a way to use a variable for the directory names?
@@ -43 +44 @@
 # put into lib for now
 cfa_cpplibdir = $(CFA_LIBDIR)
-cfa_cpplib_PROGRAMS = driver/cfa-cpp
-driver_cfa_cpp_SOURCES = $(SRC)
-driver_cfa_cpp_LDADD = -ldl                     # yywrap
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
-driver_cfa_cpp_LDFLAGS = -Xlinker -export-dynamic
+cfa_cpplib_PROGRAMS = ../driver/cfa-cpp demangler
+___driver_cfa_cpp_SOURCES = $(SRC)
+___driver_cfa_cpp_LDADD = -ldl                  # yywrap
+
+AM_CXXFLAGS = @HOST_FLAGS@ -Wno-deprecated -Wall -Wextra -DDEBUG_ALL -I./Parser -I$(srcdir)/Parser -I$(srcdir)/include -DYY_NO_INPUT -O2 -g -std=c++14
+AM_LDFLAGS  = @HOST_FLAGS@ -Xlinker -export-dynamic
+
+demangler_SOURCES = SymTab/demangler.cc
+
+demangler_LDADD = libdemangle.a     # yywrap
+
+noinst_LIBRARIES = libdemangle.a
+libdemangle_a_SOURCES = SymTab/Demangle.cc SymTab/ManglerCommon.cc \
+  SynTree/Type.cc \
+  SynTree/VoidType.cc \
+  SynTree/BasicType.cc \
+  SynTree/PointerType.cc \
+  SynTree/ArrayType.cc \
+  SynTree/ReferenceType.cc \
+  SynTree/FunctionType.cc \
+  SynTree/ReferenceToType.cc \
+  SynTree/TupleType.cc \
+  SynTree/TypeofType.cc \
+  SynTree/AttrType.cc \
+  SynTree/VarArgsType.cc \
+  SynTree/ZeroOneType.cc \
+  SynTree/Constant.cc \
+  SynTree/Expression.cc \
+  SynTree/TupleExpr.cc \
+  SynTree/CommaExpr.cc \
+  SynTree/TypeExpr.cc \
+  SynTree/ApplicationExpr.cc \
+  SynTree/AddressExpr.cc \
+  SynTree/Statement.cc \
+  SynTree/CompoundStmt.cc \
+  SynTree/DeclStmt.cc \
+  SynTree/Declaration.cc \
+  SynTree/DeclarationWithType.cc \
+  SynTree/ObjectDecl.cc \
+  SynTree/FunctionDecl.cc \
+  SynTree/AggregateDecl.cc \
+  SynTree/NamedTypeDecl.cc \
+  SynTree/TypeDecl.cc \
+  SynTree/Initializer.cc \
+  SynTree/TypeSubstitution.cc \
+  SynTree/Attribute.cc \
+  SynTree/DeclReplacer.cc \
+  CompilationState.cc \
+  CodeGen/CodeGenerator.cc \
+  CodeGen/FixMain.cc \
+  CodeGen/GenType.cc \
+  CodeGen/OperatorTable.cc \
+  Common/Assert.cc \
+  Common/Eval.cc \
+  Common/SemanticError.cc \
+  Common/UniqueName.cc \
+  Concurrency/Keywords.cc \
+  ControlStruct/ForExprMutator.cc \
+  ControlStruct/LabelFixer.cc \
+  ControlStruct/LabelGenerator.cc \
+  ControlStruct/MLEMutator.cc \
+  ControlStruct/Mutate.cc \
+  GenPoly/GenPoly.cc \
+  GenPoly/Lvalue.cc \
+  InitTweak/GenInit.cc \
+  InitTweak/InitTweak.cc \
+  Parser/LinkageSpec.cc \
+  ResolvExpr/AdjustExprType.cc \
+  ResolvExpr/Alternative.cc \
+  ResolvExpr/AlternativeFinder.cc \
+  ResolvExpr/ExplodedActual.cc \
+  ResolvExpr/CastCost.cc \
+  ResolvExpr/CommonType.cc \
+  ResolvExpr/ConversionCost.cc \
+  ResolvExpr/CurrentObject.cc \
+  ResolvExpr/FindOpenVars.cc \
+  ResolvExpr/Occurs.cc \
+  ResolvExpr/PolyCost.cc \
+  ResolvExpr/PtrsAssignable.cc \
+  ResolvExpr/PtrsCastable.cc \
+  ResolvExpr/RenameVars.cc \
+  ResolvExpr/Resolver.cc \
+  ResolvExpr/ResolveTypeof.cc \
+  ResolvExpr/TypeEnvironment.cc \
+  ResolvExpr/Unify.cc \
+  SymTab/Autogen.cc \
+  SymTab/FixFunction.cc \
+  SymTab/Indexer.cc \
+  SymTab/Mangler.cc \
+  SymTab/Validate.cc \
+  Tuples/Explode.cc \
+  Tuples/TupleAssignment.cc \
+  Tuples/TupleExpansion.cc \
+  Validate/HandleAttributes.cc
 
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}