From c39c94f90471a7dc1a28f664aebb4c4d6ac9c5d1 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Tue, 4 Aug 2015 17:55:48 +0200
Subject: [PATCH] fix glitches in bison run and parser build

---
 .hgignore                  | 2 +-
 src/Makefile.am            | 4 ++--
 src/query/wasaparse.ypp    | 2 +-
 src/query/wasaparseaux.cpp | 2 +-
 src/query/y.tab.h          | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.hgignore b/.hgignore
index 7bb21682..062d9979 100644
--- a/.hgignore
+++ b/.hgignore
@@ -13,6 +13,7 @@ libtool
 \#*
 ptrans
 src/aclocal.m4
+src/compile
 src/config.guess
 src/config.sub
 src/depcomp
@@ -29,7 +30,6 @@ src/config.log
 src/config.status
 src/configure
 src/ylwrap
-src/query/wasaparse.h
 src/Makefile
 src/autom4te.cache
 src/common/autoconfig.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 5b5f7aef..f0c0c231 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -143,7 +143,6 @@ query/reslistpager.cpp \
 query/reslistpager.h \
 query/sortseq.cpp \
 query/sortseq.h \
-query/wasaparse.h \
 query/wasaparse.ypp \
 query/wasaparseaux.cpp \
 query/wasaparserdriver.h \
@@ -237,7 +236,8 @@ utils/workqueue.h \
 utils/x11mon.cpp \
 utils/x11mon.h
 
-BUILT_SOURCES = query/wasaparse.cpp query/wasaparse.h
+BUILT_SOURCES = query/wasaparse.cpp query/wasaparse.hpp
+CLEANFILES = $(BUILT_SOURCES)
 
 # We use -release: the lib is only shared
 # between recoll programs from the same release.
diff --git a/src/query/wasaparse.ypp b/src/query/wasaparse.ypp
index 09a583c3..bfd87c05 100644
--- a/src/query/wasaparse.ypp
+++ b/src/query/wasaparse.ypp
@@ -8,7 +8,7 @@
 
 #include "searchdata.h"
 #include "wasaparserdriver.h"
-#include "wasaparse.h"
+#include "wasaparse.hpp"
 
 using namespace std;
 
diff --git a/src/query/wasaparseaux.cpp b/src/query/wasaparseaux.cpp
index 4a4deb42..4e45666a 100644
--- a/src/query/wasaparseaux.cpp
+++ b/src/query/wasaparseaux.cpp
@@ -26,7 +26,7 @@
 #define YYDEBUG 1
 
 // bison-generated file
-#include "wasaparse.h"
+#include "wasaparse.hpp"
 
 using namespace std;
 using namespace Rcl;
diff --git a/src/query/y.tab.h b/src/query/y.tab.h
index 27fd5334..78637777 100644
--- a/src/query/y.tab.h
+++ b/src/query/y.tab.h
@@ -3,11 +3,11 @@
 // Bison generates y.tab.h and inserts a line in the generated cpp
 // file to include it
 
-// However, we tell automake to use wasaparse.cpp and wasaparse.h as
+// However, we tell automake to use wasaparse.cpp and wasaparse.hpp as
 // names for the generated files. This does not fix the #include
 // y.tab.h line, so it fails.
 
 // This workaround file just includes the appropriate file as
 // generated by automake
 
-#include "wasaparse.h"
+#include "wasaparse.hpp"