Changes in src/Makefile.am [292d599b:4fd45bc]

File:

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

src/Makefile.am

@@ -10 +10 @@
 ## Author           : Peter A. Buhr
 ## Created On       : Sun May 31 08:51:46 2015
-## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Feb 15 09:44:09 2019
-## Update Count     : 97
+## Last Modified By : Andrew Beach
+## Last Modified On : Tus Jul 25 10:34:00 2017
+## Update Count     : 76
 ###############################################################################
 
@@ -20 +20 @@
 
 SRC = main.cc \
-      MakeLibCfa.cc \
-      CompilationState.cc
-
-SRCDEMANGLE = CompilationState.cc
+                        MakeLibCfa.cc \
+                        CompilationState.cc
 
 MAINTAINERCLEANFILES =
-MOSTLYCLEANFILES =
+MOSTLYCLEANFILES = Parser/gcc-flags.h
 
-if WITH_LIBPROFILER
-LIBPROFILER = -lprofiler
-endif
+Parser/gcc-flags.h :
+        ${AM_V_GEN}$(CC) -dM -E - < /dev/null | sed 's/define /define __GCC__/' > $(@)
 
-if WITH_LIBTCMALLOC
-LIBTCMALLOC = -ltcmalloc
-TCMALLOCFLAG = -DTCMALLOC
-endif
+Parser/lex.ll : Parser/gcc-flags.h
 
 include CodeGen/module.mk
@@ -52 +46 @@
 include Virtual/module.mk
 
-$(addprefix $(srcdir)/, ResolvExpr/ConversionCost.cc ResolvExpr/CommonType.cc SymTab/ManglerCommon.cc) : $(srcdir)/SynTree/Type.h
-
-$(srcdir)/SynTree/Type.h : BasicTypes-gen.cc
-        ${AM_V_GEN}${CXXCOMPILE} $< -o BasicTypes-gen -Wall -Wextra
-        @./BasicTypes-gen
-        @rm BasicTypes-gen
-
 # put into lib for now
 cfa_cpplibdir = $(CFA_LIBDIR)
 cfa_cpplib_PROGRAMS = ../driver/cfa-cpp demangler
 ___driver_cfa_cpp_SOURCES = $(SRC)
-___driver_cfa_cpp_LDADD = -ldl $(LIBPROFILER) $(LIBTCMALLOC)
+___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 -O3 -g -std=c++14 $(TCMALLOCFLAG)
+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
 ARFLAGS     = cr
@@ -71 +58 @@
 demangler_SOURCES = SymTab/demangler.cc
 
-demangler_LDADD = libdemangle.a -ldl                    # yywrap
+demangler_LDADD = libdemangle.a     # yywrap
 
 noinst_LIBRARIES = libdemangle.a
-libdemangle_a_SOURCES = $(SRCDEMANGLE)
+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/ResolveAssertions.cc \
+        ResolvExpr/Resolver.cc \
+        ResolvExpr/ResolveTypeof.cc \
+        ResolvExpr/SpecCost.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}}