X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Fcommon%2Fmetadata%2FMakefile.am;h=7d843d64653ab09f22e8fd1bad058fc1f0d3e891;hb=087cd0f57f0f7d815a609a4e041d1200f380e4aa;hp=d37b3835a590d43f540108a07975b904ed1f1d62;hpb=9103e903a89377e9cfad13905d4f4b650aecd061;p=babeltrace.git

diff --git a/src/plugins/ctf/common/metadata/Makefile.am b/src/plugins/ctf/common/metadata/Makefile.am
index d37b3835..7d843d64 100644
--- a/src/plugins/ctf/common/metadata/Makefile.am
+++ b/src/plugins/ctf/common/metadata/Makefile.am
@@ -1,46 +1,55 @@
+# SPDX-License-Identifier: MIT
+
 AM_CPPFLAGS += -I$(builddir) -I$(srcdir)
 AM_YFLAGS = -t -d -v -Wno-yacc
 
 noinst_LTLIBRARIES = libctf-parser.la libctf-ast.la
 
-BUILT_SOURCES = parser.h
+BUILT_SOURCES = parser.hpp
 
-libctf_parser_la_SOURCES = lexer.l parser.y objstack.c
+libctf_parser_la_SOURCES = lexer.lpp parser.ypp objstack.cpp
 # scanner-symbols.h is included to prefix generated yy_* symbols
 # with bt_.
 libctf_parser_la_CPPFLAGS = $(AM_CPPFLAGS) \
-		-include $(srcdir)/scanner-symbols.h
-libctf_parser_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-function
+		-include $(srcdir)/scanner-symbols.hpp
+
+# This library contains (mostly) generated code, silence some warnings that it
+# produces.
+libctf_parser_la_CXXFLAGS = $(AM_CXXFLAGS) \
+	-Wno-unused-function \
+	-Wno-null-dereference
 
 libctf_ast_la_SOURCES = \
-	visitor-generate-ir.c \
-	visitor-semantic-validator.c \
-	visitor-parent-links.c \
-	ast.h \
-	objstack.h \
-	parser.h \
-	parser-wrap.h \
-	scanner.h \
-	scanner-symbols.h \
-	decoder.c \
-	decoder-packetized-file-stream-to-buf.c \
-	decoder.h \
-	logging.c \
-	logging.h \
-	ctf-meta.h \
-	ctf-meta-visitors.h \
-	ctf-meta-validate.c \
-	ctf-meta-update-meanings.c \
-	ctf-meta-update-in-ir.c \
-	ctf-meta-update-default-clock-classes.c \
-	ctf-meta-update-text-array-sequence.c \
-	ctf-meta-update-value-storing-indexes.c \
-	ctf-meta-update-stream-class-config.c \
-	ctf-meta-warn-meaningless-header-fields.c \
-	ctf-meta-translate.c \
-	ctf-meta-resolve.c \
-	ctf-meta-configure-ir-trace.c \
-	ctf-meta-configure-ir-trace.h
+	visitor-generate-ir.cpp \
+	visitor-semantic-validator.cpp \
+	visitor-parent-links.cpp \
+	ast.hpp \
+	objstack.hpp \
+	parser.hpp \
+	parser-wrap.hpp \
+	scanner.hpp \
+	scanner-symbols.hpp \
+	decoder.cpp \
+	decoder.hpp \
+	decoder-packetized-file-stream-to-buf.cpp \
+	decoder-packetized-file-stream-to-buf.hpp \
+	logging.cpp \
+	logging.hpp \
+	ctf-meta.hpp \
+	ctf-meta-visitors.hpp \
+	ctf-meta-validate.cpp \
+	ctf-meta-update-meanings.cpp \
+	ctf-meta-update-in-ir.cpp \
+	ctf-meta-update-default-clock-classes.cpp \
+	ctf-meta-update-text-array-sequence.cpp \
+	ctf-meta-update-alignments.cpp \
+	ctf-meta-update-value-storing-indexes.cpp \
+	ctf-meta-update-stream-class-config.cpp \
+	ctf-meta-warn-meaningless-header-fields.cpp \
+	ctf-meta-translate.cpp \
+	ctf-meta-resolve.cpp \
+	ctf-meta-configure-ir-trace.cpp \
+	ctf-meta-configure-ir-trace.hpp
 
 if BABELTRACE_BUILD_WITH_MINGW
 libctf_ast_la_LIBADD = -lintl -liconv -lole32
@@ -51,32 +60,32 @@ CLEANFILES =
 
 if HAVE_BISON
 # we have bison: we can clean the generated parser files
-CLEANFILES += parser.c parser.h parser.output
+CLEANFILES += parser.cpp parser.hpp parser.output
 else # HAVE_BISON
 # create target used to stop the build if we want to build the parser,
 # but we don't have the necessary tool to do so
 ERR_MSG = "Error: Cannot build target because bison is missing."
 ERR_MSG += "Make sure bison is installed and run the configure script again."
 
-parser.c parser.h: parser.y
+parser.cpp parser.hpp: parser.ypp
 	@echo $(ERR_MSG)
 	@false
 
-all-local: parser.c parser.h
+all-local: parser.cpp parser.hpp
 endif # HAVE_BISON
 
 if HAVE_FLEX
 # we have flex: we can clean the generated lexer files
-CLEANFILES += lexer.c
+CLEANFILES += lexer.cpp
 else # HAVE_FLEX
 # create target used to stop the build if we want to build the lexer,
 # but we don't have the necessary tool to do so
 ERR_MSG = "Error: Cannot build target because flex is missing."
 ERR_MSG += "Make sure flex is installed and run the configure script again."
 
-filter-lexer.c: lexer.l
+filter-lexer.cpp: lexer.lpp
 	@echo $(ERR_MSG)
 	@false
 
-all-local: lexer.c
+all-local: lexer.cpp
 endif # HAVE_FLEX