From d80815ac23192b0b3a2ebc82e6a7e512968bacb1 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 8 Sep 2019 18:48:49 +0200 Subject: [PATCH] build: fix distcheck * configure.ac (gl_LIBOBJS): Adjust so that the generated files are indeed the expected ones. --- configure.ac | 11 +++++++++++ src/parse-gram.c | 6 ++++-- src/parse-gram.h | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 83e2c972..6f323691 100644 --- a/configure.ac +++ b/configure.ac @@ -297,4 +297,15 @@ AC_SUBST([GCC]) AC_CONFIG_FILES([Makefile po/Makefile.in doc/yacc.1]) + +# Fix LIBOBJS to give the Makefile the right file names. Otherwise +# compilation works, but with unexpected file names, so clean rules don't +# remove the actual files and distcheck fails. +AC_CONFIG_COMMANDS_PRE([ + case $am__api_version in + 1.14*|1.15*) gl_LIBOBJS=`echo "$gl_LIBOBJS" | sed -e 's, lib/, lib/lib_libbison_a-,g'`;; + *) gl_LIBOBJS=`echo "$gl_LIBOBJS" | sed -e 's, lib/, lib/libbison_a-,g'`;; + esac +]) + AC_OUTPUT diff --git a/src/parse-gram.c b/src/parse-gram.c index fd1dec3c..2d0be44d 100644 --- a/src/parse-gram.c +++ b/src/parse-gram.c @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.4. */ +/* A Bison parser, made by GNU Bison 3.4.1.26-d17af. */ /* Bison implementation for Yacc-like parsers in C @@ -48,7 +48,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.4" +#define YYBISON_VERSION "3.4.1.26-d17af" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -886,6 +886,7 @@ yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YY /* "%code pre-printer" blocks. */ tron (yyo); + YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN switch (yytype) { case 3: /* "string" */ @@ -1069,6 +1070,7 @@ tron (yyo); default: break; } + YY_IGNORE_MAYBE_UNINITIALIZED_END /* "%code post-printer" blocks. */ troff (yyo); diff --git a/src/parse-gram.h b/src/parse-gram.h index 1009592f..68d2b693 100644 --- a/src/parse-gram.h +++ b/src/parse-gram.h @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.4. */ +/* A Bison parser, made by GNU Bison 3.4.1.26-d17af. */ /* Bison interface for Yacc-like parsers in C