X-Git-Url: https://git.liburcu.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ffilter%2FMakefile.am;h=4a6e4ff8d25c8078d0a3ce41d337eeabc3e0c4a4;hp=cac4cb17575ed820a3031fa1c47c0db59932286f;hb=c9753f7250f33184a1859088a691291f37161f25;hpb=e4d2f27a74baf6942ac8fcafd5ea53e775ceceb3

diff --git a/src/common/filter/Makefile.am b/src/common/filter/Makefile.am
index cac4cb175..4a6e4ff8d 100644
--- a/src/common/filter/Makefile.am
+++ b/src/common/filter/Makefile.am
@@ -2,27 +2,26 @@
 
 AM_CPPFLAGS += -I$(srcdir) -I$(builddir)
 
-noinst_PROGRAMS = filter-grammar-test
 noinst_LTLIBRARIES = libfilter.la
 noinst_HEADERS = filter-ast.h \
 		filter-symbols.h
 
-BUILT_SOURCES = filter-parser.h
+BUILT_SOURCES = filter-parser.hpp
 
 libfilter_la_SOURCES = \
-	filter-parser.y filter-lexer.l \
-	filter-visitor-xml.c \
-	filter-visitor-generate-ir.c \
-	filter-visitor-ir-check-binary-op-nesting.c \
-	filter-visitor-ir-validate-string.c \
-	filter-visitor-ir-validate-globbing.c \
-	filter-visitor-ir-normalize-glob-patterns.c \
-	filter-visitor-generate-bytecode.c \
+	filter-lexer.lpp \
+	filter-parser.ypp \
+	filter-visitor-xml.cpp \
+	filter-visitor-generate-ir.cpp \
+	filter-visitor-ir-check-binary-op-nesting.cpp \
+	filter-visitor-ir-validate-string.cpp \
+	filter-visitor-ir-validate-globbing.cpp \
+	filter-visitor-ir-normalize-glob-patterns.cpp \
+	filter-visitor-generate-bytecode.cpp \
 	filter-ast.h \
-	filter-bytecode.h \
 	filter-ir.h \
 	memstream.h
-libfilter_la_CFLAGS = -include filter-symbols.h $(AM_CFLAGS)
+libfilter_la_CXXFLAGS = -include filter-symbols.h $(AM_CXXFLAGS)
 libfilter_la_LIBADD = $(top_builddir)/src/common/string-utils/libstring-utils.la
 
 AM_YFLAGS = -t -d -v -Wno-yacc
@@ -32,35 +31,32 @@ CLEANFILES =
 
 if HAVE_BISON
 # we have bison: we can clean the generated parser files
-CLEANFILES += filter-parser.c filter-parser.h filter-parser.output
+CLEANFILES += filter-parser.cpp filter-parser.hpp filter-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."
 
-filter-parser.c filter-parser.h: filter-parser.y
+filter-parser.cpp filter-parser.hpp: filter-parser.ypp
 	@echo $(ERR_MSG)
 	@false
 
-all-local: filter-parser.c filter-parser.h
+all-local: filter-parser.cpp filter-parser.hpp
 endif # HAVE_BISON
 
 if HAVE_FLEX
 # we have flex: we can clean the generated lexer files
-CLEANFILES += filter-lexer.c
+CLEANFILES += filter-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: filter-lexer.l
+filter-lexer.cpp: filter-lexer.lpp
 	@echo $(ERR_MSG)
 	@false
 
-all-local: filter-lexer.c
+all-local: filter-lexer.cpp
 endif # HAVE_FLEX
-
-filter_grammar_test_SOURCES = filter-grammar-test.c
-filter_grammar_test_LDADD = libfilter.la