From 85f98c8a668fa3211722bfb85097f8e1d0e19b4c Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Tue, 7 Mar 2017 16:17:49 +0300 Subject: [PATCH] Fix "make dist" after recent changes to parser In particular, it is now possible to either build ModSecurity with pre-generated parser, or use "--enable-parser-generation" configure option to rebuild parser from sources. --- examples/Makefile.am | 3 +++ src/Makefile.am | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index ac41dc65..669fb01e 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -8,6 +8,9 @@ SUBDIRS = \ reading_logs_with_offset \ reading_logs_via_rule_message +pkginclude_HEADERS = \ + reading_logs_via_rule_message/reading_logs_via_rule_message.h + # make clean CLEANFILES = diff --git a/src/Makefile.am b/src/Makefile.am index 3534b0b2..e19b09f0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,18 @@ libmodsecurity_includesub_collectiondir = $(pkgincludedir)/collection/ libmodsecurity_includesub_actionsdir = $(pkgincludedir)/actions/ -EXTRA_DIST = $(CLEANFILES) +# pregenerated parser + parser sources +EXTRA_DIST = \ + parser/Makefile.am \ + parser/Makefile.in \ + parser/location.hh \ + parser/position.hh \ + parser/seclang-parser.cc \ + parser/seclang-parser.hh \ + parser/seclang-parser.yy \ + parser/seclang-scanner.cc \ + parser/seclang-scanner.ll \ + parser/stack.hh MAINTAINERCLEANFILES = \ Makefile.in \