Changeset 8d70648 for src/Makefile.in

Timestamp:

May 30, 2019, 4:15:08 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

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:

a935892, f474e91

Parents:

d76c588 (diff), d88f8b3b (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:

• src/Makefile.in (modified) (7 diffs)

src/Makefile.in

@@ -235 +235 @@
         $(am__objects_7) Tuples/TupleAssignment.$(OBJEXT) \
         Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
-        Validate/HandleAttributes.$(OBJEXT)
+        Validate/HandleAttributes.$(OBJEXT) \
+        Validate/FindSpecialDecls.$(OBJEXT)
 am_libdemangle_a_OBJECTS = $(am__objects_8)
 libdemangle_a_OBJECTS = $(am_libdemangle_a_OBJECTS)
@@ -266 +267 @@
         Tuples/TupleExpansion.$(OBJEXT) Tuples/Explode.$(OBJEXT) \
         Validate/HandleAttributes.$(OBJEXT) \
+        Validate/FindSpecialDecls.$(OBJEXT) \
         Virtual/ExpandCasts.$(OBJEXT)
 am____driver_cfa_cpp_OBJECTS = $(am__objects_9)
@@ -556 +558 @@
         $(SRC_SYMTAB) $(SRC_SYNTREE) Tuples/TupleAssignment.cc \
         Tuples/TupleExpansion.cc Tuples/Explode.cc \
-        Validate/HandleAttributes.cc Virtual/ExpandCasts.cc
+        Validate/HandleAttributes.cc Validate/FindSpecialDecls.cc \
+        Virtual/ExpandCasts.cc
 SRCDEMANGLE = CompilationState.cc $(SRC_AST) $(SRC_CODEGEN) \
         Concurrency/Keywords.cc $(SRC_COMMON) $(SRC_CONTROLSTRUCT) \
@@ -563 +566 @@
         $(SRC_SYMTAB) SymTab/Demangle.cc $(SRC_SYNTREE) \
         Tuples/TupleAssignment.cc Tuples/TupleExpansion.cc \
-        Tuples/Explode.cc Validate/HandleAttributes.cc
+        Tuples/Explode.cc Validate/HandleAttributes.cc \
+        Validate/FindSpecialDecls.cc
 MAINTAINERCLEANFILES = ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}
 MOSTLYCLEANFILES = Parser/lex.cc Parser/parser.cc Parser/parser.hh \
@@ -688 +692 @@
 AM_LDFLAGS = @HOST_FLAGS@ -Xlinker -export-dynamic
 ARFLAGS = cr
-demangler_SOURCES = SymTab/demangler.cc
+demangler_SOURCES = SymTab/demangler.cc # test driver for the demangler, also useful as a sanity check that libdemangle.a is complete
 demangler_LDADD = libdemangle.a -ldl                    # yywrap
 noinst_LIBRARIES = libdemangle.a
@@ -1016 +1020 @@
 Validate/HandleAttributes.$(OBJEXT): Validate/$(am__dirstamp) \
         Validate/$(DEPDIR)/$(am__dirstamp)
+Validate/FindSpecialDecls.$(OBJEXT): Validate/$(am__dirstamp) \
+        Validate/$(DEPDIR)/$(am__dirstamp)
 
 libdemangle.a: $(libdemangle_a_OBJECTS) $(libdemangle_a_DEPENDENCIES) $(EXTRA_libdemangle_a_DEPENDENCIES) 
@@ -1310 +1316 @@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleAssignment.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Tuples/$(DEPDIR)/TupleExpansion.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/FindSpecialDecls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Validate/$(DEPDIR)/HandleAttributes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Virtual/$(DEPDIR)/ExpandCasts.Po@am__quote@