Changeset 07ca4dd for src/Makefile.in


Ignore:
Timestamp:
Jun 18, 2019, 9:30:42 AM (5 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
bc92bee
Parents:
8220e50 (diff), ea05f8d (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:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.in

    r8220e50 r07ca4dd  
    239239        $(am__objects_7) Tuples/TupleAssignment.$(OBJEXT) \
    240240        Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
    241         Validate/HandleAttributes.$(OBJEXT) \
     241        Tuples/Tuples.$(OBJEXT) Validate/HandleAttributes.$(OBJEXT) \
    242242        Validate/FindSpecialDecls.$(OBJEXT)
    243243am_libdemangle_a_OBJECTS = $(am__objects_8)
     
    270270        Tuples/TupleAssignment.$(OBJEXT) \
    271271        Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
    272         Validate/HandleAttributes.$(OBJEXT) \
     272        Tuples/Tuples.$(OBJEXT) Validate/HandleAttributes.$(OBJEXT) \
    273273        Validate/FindSpecialDecls.$(OBJEXT) \
    274274        Virtual/ExpandCasts.$(OBJEXT)
     
    561561        $(SRC_RESOLVEXPR) ResolvExpr/AlternativePrinter.cc \
    562562        $(SRC_SYMTAB) $(SRC_SYNTREE) Tuples/TupleAssignment.cc \
    563         Tuples/TupleExpansion.cc Tuples/Explode.cc \
     563        Tuples/TupleExpansion.cc Tuples/Explode.cc Tuples/Tuples.cc \
    564564        Validate/HandleAttributes.cc Validate/FindSpecialDecls.cc \
    565565        Virtual/ExpandCasts.cc
     
    570570        $(SRC_SYMTAB) SymTab/Demangle.cc $(SRC_SYNTREE) \
    571571        Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \
    572         Tuples/Explode.cc Validate/HandleAttributes.cc \
    573         Validate/FindSpecialDecls.cc
     572        Tuples/Explode.cc Tuples/Tuples.cc \
     573        Validate/HandleAttributes.cc Validate/FindSpecialDecls.cc
    574574MAINTAINERCLEANFILES = ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
    575575MOSTLYCLEANFILES = Parser/lex.cc Parser/parser.cc Parser/parser.hh \
     
    10301030        Tuples/$(DEPDIR)/$(am__dirstamp)
    10311031Tuples/Explode.$(OBJEXT): Tuples/$(am__dirstamp) \
     1032        Tuples/$(DEPDIR)/$(am__dirstamp)
     1033Tuples/Tuples.$(OBJEXT): Tuples/$(am__dirstamp) \
    10321034        Tuples/$(DEPDIR)/$(am__dirstamp)
    10331035Validate/$(am__dirstamp):
     
    13401342@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleAssignment.Po@am__quote@
    13411343@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleExpansion.Po@am__quote@
     1344@AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/Tuples.Po@am__quote@
    13421345@AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/FindSpecialDecls.Po@am__quote@
    13431346@AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/HandleAttributes.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.