fix glitches in bison run and parser build

.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

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.

src/query/wasaparse.ypp

@@ -8,7 +8,7 @@
 
 #include "searchdata.h"
 #include "wasaparserdriver.h"
-#include "wasaparse.h"
+#include "wasaparse.hpp"
 
 using namespace std;
 

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;

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"