Changeset 3d5701e for src/Parser/module.mk

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 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:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• src/Parser/module.mk (modified) (2 diffs)

src/Parser/module.mk

@@ -11 +11 @@
 ## Created On       : Sat May 16 15:29:09 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Wed Jun 28 21:58:29 2017
-## Update Count     : 104
+## Last Modified On : Sat Dec 14 07:34:47 2019
+## Update Count     : 107
 ###############################################################################
 
@@ -19 +19 @@
 AM_YFLAGS = -d -t -v
 
-SRC += Parser/parser.yy \
-       Parser/lex.ll \
-       Parser/TypedefTable.cc \
-       Parser/ParseNode.cc \
+SRC += \
        Parser/DeclarationNode.cc \
        Parser/ExpressionNode.cc \
+       Parser/InitializerNode.cc \
+       Parser/ParseNode.cc \
        Parser/StatementNode.cc \
-       Parser/InitializerNode.cc \
        Parser/TypeData.cc \
-       Parser/LinkageSpec.cc \
+       Parser/TypedefTable.cc \
+       Parser/lex.ll \
+       Parser/parser.yy \
        Parser/parserutility.cc
 
-SRCDEMANGLE += \
-        Parser/LinkageSpec.cc
-
-
 MOSTLYCLEANFILES += Parser/lex.cc Parser/parser.cc Parser/parser.hh Parser/parser.output