X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ffilter%2FMakefile.am;fp=src%2Fcommon%2Ffilter%2FMakefile.am;h=4a6e4ff8d25c8078d0a3ce41d337eeabc3e0c4a4;hp=62928035654f65b48d413e0239cb5a6cadc9f74e;hb=348ddc5c9107149d48b1f12d31a7e75e9b73b4da;hpb=e032c6fd0419a73188f7143b18625b43a8d8f7c3 diff --git a/src/common/filter/Makefile.am b/src/common/filter/Makefile.am index 629280356..4a6e4ff8d 100644 --- a/src/common/filter/Makefile.am +++ b/src/common/filter/Makefile.am @@ -6,21 +6,22 @@ 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-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 @@ -30,32 +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