Changeset 72514aa for src/Makefile.in


Ignore:
Timestamp:
Jan 29, 2019, 5:02:11 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer
Children:
1e7e44f
Parents:
692be4e
Message:

Fixed bad merge on some files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.in

    r692be4e r72514aa  
    618618        Virtual/ExpandCasts.cc
    619619MAINTAINERCLEANFILES = ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
    620 MOSTLYCLEANFILES = Parser/parser.hh Parser/parser.output
     620MOSTLYCLEANFILES = Parser/gcc-flags.h Parser/lex.cc Parser/parser.cc \
     621        Parser/parser.hh Parser/parser.output
    621622BUILT_SOURCES = Parser/parser.hh
    622623AM_YFLAGS = -d -t -v
    623 
    624 # Is there a way to use a variable for the directory names?
    625624
    626625# put into lib for now
     
    635634noinst_LIBRARIES = libdemangle.a
    636635libdemangle_a_SOURCES = SymTab/Demangle.cc SymTab/ManglerCommon.cc \
    637   SynTree/Type.cc \
    638   SynTree/VoidType.cc \
    639   SynTree/BasicType.cc \
    640   SynTree/PointerType.cc \
    641   SynTree/ArrayType.cc \
    642   SynTree/ReferenceType.cc \
    643   SynTree/FunctionType.cc \
    644   SynTree/ReferenceToType.cc \
    645   SynTree/TupleType.cc \
    646   SynTree/TypeofType.cc \
    647   SynTree/AttrType.cc \
    648   SynTree/VarArgsType.cc \
    649   SynTree/ZeroOneType.cc \
    650   SynTree/Constant.cc \
    651   SynTree/Expression.cc \
    652   SynTree/TupleExpr.cc \
    653   SynTree/CommaExpr.cc \
    654   SynTree/TypeExpr.cc \
    655   SynTree/ApplicationExpr.cc \
    656   SynTree/AddressExpr.cc \
    657   SynTree/Statement.cc \
    658   SynTree/CompoundStmt.cc \
    659   SynTree/DeclStmt.cc \
    660   SynTree/Declaration.cc \
    661   SynTree/DeclarationWithType.cc \
    662   SynTree/ObjectDecl.cc \
    663   SynTree/FunctionDecl.cc \
    664   SynTree/AggregateDecl.cc \
    665   SynTree/NamedTypeDecl.cc \
    666   SynTree/TypeDecl.cc \
    667   SynTree/Initializer.cc \
    668   SynTree/TypeSubstitution.cc \
    669   SynTree/Attribute.cc \
    670   SynTree/DeclReplacer.cc \
    671   CompilationState.cc \
    672   CodeGen/CodeGenerator.cc \
    673   CodeGen/FixMain.cc \
    674   CodeGen/GenType.cc \
    675   CodeGen/OperatorTable.cc \
    676   Common/Assert.cc \
    677   Common/Eval.cc \
    678   Common/SemanticError.cc \
    679   Common/UniqueName.cc \
    680   Concurrency/Keywords.cc \
    681   ControlStruct/ForExprMutator.cc \
    682   ControlStruct/LabelFixer.cc \
    683   ControlStruct/LabelGenerator.cc \
    684   ControlStruct/MLEMutator.cc \
    685   ControlStruct/Mutate.cc \
    686   GenPoly/GenPoly.cc \
    687   GenPoly/Lvalue.cc \
    688   InitTweak/GenInit.cc \
    689   InitTweak/InitTweak.cc \
    690   Parser/LinkageSpec.cc \
    691   ResolvExpr/AdjustExprType.cc \
    692   ResolvExpr/Alternative.cc \
    693   ResolvExpr/AlternativeFinder.cc \
    694   ResolvExpr/ExplodedActual.cc \
    695   ResolvExpr/CastCost.cc \
    696   ResolvExpr/CommonType.cc \
    697   ResolvExpr/ConversionCost.cc \
    698   ResolvExpr/CurrentObject.cc \
    699   ResolvExpr/FindOpenVars.cc \
    700   ResolvExpr/Occurs.cc \
    701   ResolvExpr/PolyCost.cc \
    702   ResolvExpr/PtrsAssignable.cc \
    703   ResolvExpr/PtrsCastable.cc \
    704   ResolvExpr/RenameVars.cc \
    705   ResolvExpr/ResolveAssertions.cc \
    706   ResolvExpr/Resolver.cc \
    707   ResolvExpr/ResolveTypeof.cc \
    708   ResolvExpr/SpecCost.cc \
    709   ResolvExpr/TypeEnvironment.cc \
    710   ResolvExpr/Unify.cc \
    711   SymTab/Autogen.cc \
    712   SymTab/FixFunction.cc \
    713   SymTab/Indexer.cc \
    714   SymTab/Mangler.cc \
    715   SymTab/Validate.cc \
    716   Tuples/Explode.cc \
    717   Tuples/TupleAssignment.cc \
    718   Tuples/TupleExpansion.cc \
    719   Validate/HandleAttributes.cc
     636        SynTree/Type.cc \
     637        SynTree/VoidType.cc \
     638        SynTree/BasicType.cc \
     639        SynTree/PointerType.cc \
     640        SynTree/ArrayType.cc \
     641        SynTree/ReferenceType.cc \
     642        SynTree/FunctionType.cc \
     643        SynTree/ReferenceToType.cc \
     644        SynTree/TupleType.cc \
     645        SynTree/TypeofType.cc \
     646        SynTree/AttrType.cc \
     647        SynTree/VarArgsType.cc \
     648        SynTree/ZeroOneType.cc \
     649        SynTree/Constant.cc \
     650        SynTree/Expression.cc \
     651        SynTree/TupleExpr.cc \
     652        SynTree/CommaExpr.cc \
     653        SynTree/TypeExpr.cc \
     654        SynTree/ApplicationExpr.cc \
     655        SynTree/AddressExpr.cc \
     656        SynTree/Statement.cc \
     657        SynTree/CompoundStmt.cc \
     658        SynTree/DeclStmt.cc \
     659        SynTree/Declaration.cc \
     660        SynTree/DeclarationWithType.cc \
     661        SynTree/ObjectDecl.cc \
     662        SynTree/FunctionDecl.cc \
     663        SynTree/AggregateDecl.cc \
     664        SynTree/NamedTypeDecl.cc \
     665        SynTree/TypeDecl.cc \
     666        SynTree/Initializer.cc \
     667        SynTree/TypeSubstitution.cc \
     668        SynTree/Attribute.cc \
     669        SynTree/DeclReplacer.cc \
     670        CompilationState.cc \
     671        CodeGen/CodeGenerator.cc \
     672        CodeGen/FixMain.cc \
     673        CodeGen/GenType.cc \
     674        CodeGen/OperatorTable.cc \
     675        Common/Assert.cc \
     676        Common/Eval.cc \
     677        Common/SemanticError.cc \
     678        Common/UniqueName.cc \
     679        Concurrency/Keywords.cc \
     680        ControlStruct/ForExprMutator.cc \
     681        ControlStruct/LabelFixer.cc \
     682        ControlStruct/LabelGenerator.cc \
     683        ControlStruct/MLEMutator.cc \
     684        ControlStruct/Mutate.cc \
     685        GenPoly/GenPoly.cc \
     686        GenPoly/Lvalue.cc \
     687        InitTweak/GenInit.cc \
     688        InitTweak/InitTweak.cc \
     689        Parser/LinkageSpec.cc \
     690        ResolvExpr/AdjustExprType.cc \
     691        ResolvExpr/Alternative.cc \
     692        ResolvExpr/AlternativeFinder.cc \
     693        ResolvExpr/ExplodedActual.cc \
     694        ResolvExpr/CastCost.cc \
     695        ResolvExpr/CommonType.cc \
     696        ResolvExpr/ConversionCost.cc \
     697        ResolvExpr/CurrentObject.cc \
     698        ResolvExpr/FindOpenVars.cc \
     699        ResolvExpr/Occurs.cc \
     700        ResolvExpr/PolyCost.cc \
     701        ResolvExpr/PtrsAssignable.cc \
     702        ResolvExpr/PtrsCastable.cc \
     703        ResolvExpr/RenameVars.cc \
     704        ResolvExpr/ResolveAssertions.cc \
     705        ResolvExpr/Resolver.cc \
     706        ResolvExpr/ResolveTypeof.cc \
     707        ResolvExpr/SpecCost.cc \
     708        ResolvExpr/TypeEnvironment.cc \
     709        ResolvExpr/Unify.cc \
     710        SymTab/Autogen.cc \
     711        SymTab/FixFunction.cc \
     712        SymTab/Indexer.cc \
     713        SymTab/Mangler.cc \
     714        SymTab/Validate.cc \
     715        Tuples/Explode.cc \
     716        Tuples/TupleAssignment.cc \
     717        Tuples/TupleExpansion.cc \
     718        Validate/HandleAttributes.cc
    720719
    721720all: $(BUILT_SOURCES)
     
    15591558
    15601559
     1560Parser/gcc-flags.h :
     1561        ${AM_V_GEN}$(CC) -dM -E - < /dev/null | sed 's/define /define __GCC__/' > $(@)
     1562
     1563Parser/lex.ll : Parser/gcc-flags.h
     1564
    15611565# Tell versions [3.59,3.63) of GNU make to not export all variables.
    15621566# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.