Alien-flex
view release on metacpan or search on metacpan
patch/flex-2.6.4.diff view on Meta::CPAN
@@ -73,6 +73,13 @@ void ccladd (int cclp, int ch)
newpos = ind + len;
+ /* For a non-last cclp, expanding the set will overflow and overwrite a
+ * char in the next cclp.
+ * FIXME: Need another allocation scheme for ccl's. */
+ if (cclp != lastccl) {
+ flexfatal(_("internal error: trying to add a char to a non-last ccl.\n"));
+ }
+
if (newpos >= current_max_ccl_tbl_size) {
current_max_ccl_tbl_size += MAX_CCL_TBL_SIZE_INCREMENT;
diff --git a/src/config.h.in b/src/config.h.in
index 4756505..831db6d 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -101,6 +101,9 @@
/* Define to 1 if you have the `Needed' function. */
#undef HAVE_NEEDED
+/* Define to 1 if you have the `NetBSD' function. */
+#undef HAVE_NETBSD
+
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
@@ -126,6 +129,9 @@
and to 0 otherwise. */
#undef HAVE_REALLOC
+/* Define to 1 if you have the `reallocarr' function. */
+#undef HAVE_REALLOCARR
+
/* Define to 1 if you have the `reallocarray' function. */
#undef HAVE_REALLOCARRAY
@@ -180,6 +186,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the `Use' function. */
+#undef HAVE_USE
+
/* Define to 1 if you have the `Used' function. */
#undef HAVE_USED
@@ -239,6 +248,28 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
/* Version number of package */
#undef VERSION
@@ -246,6 +277,16 @@
`char[]'. */
#undef YYTEXT_POINTER
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
diff --git a/src/filter.c b/src/filter.c
index 71f3635..a7e69ec 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -47,10 +47,9 @@ struct filter *filter_create_ext (struct filter *chain, const char *cmd,
va_list ap;
/* allocate and initialize new filter */
- f = malloc(sizeof(struct filter));
+ f = calloc(sizeof(struct filter), 1);
if (!f)
- flexerror(_("malloc failed (f) in filter_create_ext"));
- memset (f, 0, sizeof (*f));
+ flexerror(_("calloc failed (f) in filter_create_ext"));
f->filter_func = NULL;
f->extra = NULL;
f->next = NULL;
@@ -100,10 +99,9 @@ struct filter *filter_create_int (struct filter *chain,
struct filter *f;
/* allocate and initialize new filter */
- f = malloc(sizeof(struct filter));
+ f = calloc(sizeof(struct filter), 1);
if (!f)
- flexerror(_("malloc failed in filter_create_int"));
- memset (f, 0, sizeof (*f));
+ flexerror(_("calloc failed in filter_create_int"));
patch/flex-2.6.4.diff view on Meta::CPAN
- return scanopt_err (s, is_short, SCANOPT_ERR_ARG_NOT_FOUND);
+ if (!optarg && !has_next) {
+ scanopt_err(s, is_short, SCANOPT_ERR_ARG_NOT_FOUND);
+ return SCANOPT_ERR_ARG_NOT_FOUND;
+ }
if (!optarg) {
/* Let the next argv element become the argument. */
diff --git a/src/tables.c b/src/tables.c
index 980d2e9..182ab63 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -87,7 +87,7 @@ int yytbl_hdr_init (struct yytbl_hdr *th, const char *version_str,
th->th_magic = YYTBL_MAGIC;
th->th_hsize = (flex_uint32_t) (14 + strlen (version_str) + 1 + strlen (name) + 1);
- th->th_hsize += yypad64 (th->th_hsize);
+ th->th_hsize += (8 - (th->th_hsize % 8)) % 8; // Pad to 64-bit boundary
th->th_ssize = 0; // Not known at this point.
th->th_flags = 0;
th->th_version = xstrdup(version_str);
@@ -124,14 +124,14 @@ int yytbl_data_destroy (struct yytbl_data *td)
/** Write enough padding to bring the file pointer to a 64-bit boundary. */
static int yytbl_write_pad64 (struct yytbl_writer *wr)
{
- int pad, bwritten = 0;
+ int bwritten = 0;
- pad = yypad64 (wr->total_written);
- while (pad-- > 0)
+ while (wr->total_written % (8 * sizeof(flex_uint8_t)) > 0) {
if (yytbl_write8 (wr, 0) < 0)
return -1;
else
bwritten++;
+ }
return bwritten;
}
diff --git a/src/tables_shared.h b/src/tables_shared.h
index bbf9910..feca251 100644
--- a/src/tables_shared.h
+++ b/src/tables_shared.h
@@ -63,12 +63,6 @@ dnl flex code (hence the name "_shared").
#define YYTBL_MAGIC 0xF13C57B1
#endif
-/** Calculate (0-7) = number bytes needed to pad n to next 64-bit boundary. */
-#ifndef yypad64
-#define yypad64(n) ((8-((n)%8))%8)
-#endif
-
-
#ifndef YYTABLES_TYPES
#define YYTABLES_TYPES
/** Possible values for td_id field. Each one corresponds to a
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2cb51df..f5a5ad0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -333,7 +333,7 @@ pthread_pthread_LDADD = @LIBPTHREAD@
# specify how to process .l files in order to test the flex built by make all
-FLEX = $(top_builddir)/src/flex
+FLEX = $(FLEXexe)
.l.c: $(FLEX)
$(AM_V_LEX)$(FLEX) -o $@ $<
@@ -445,7 +445,7 @@ top.h: top.c
# things) and the resultant list is both long an unenlightening. And
# it can be / is generated by a shell script, tableopts.sh.
-tableopts.am: tableopts.sh
+$(srcdir)/tableopts.am: tableopts.sh
$(SHELL) $(srcdir)/tableopts.sh > $(srcdir)/tableopts.am
include $(srcdir)/tableopts.am
@@ -462,28 +462,28 @@ OPT_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh
AM_OPT_LOG_FLAGS = -d $(srcdir) -i $(srcdir)/tableopts.txt -r
tableopts_opt_nr%.c: tableopts.l4 $(FLEX)
- $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) $* -o $@ $<
+ $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) $(*:_F=F) -o $@ $<
-tableopts_opt_nr%.$(OBJEXT): tableopts_opt_nr%.c
+tableopts_opt_nr%.$(OBJEXT): tableopts_opt_nr%.c
$(AM_V_CC)$(COMPILE) -c -o $@ $<
tableopts_opt_r%.c: tableopts.l4 $(FLEX)
- $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --reentrant $* -o $@ $<
+ $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --reentrant $(subst _F,F,$*) -o $@ $<
-tableopts_opt_r%.$(OBJEXT): tableopts_opt_r%.c
+tableopts_opt_r%.$(OBJEXT): tableopts_opt_r%.c
$(AM_V_CC)$(COMPILE) -DTEST_IS_REENTRANT -c -o $@ $<
SER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh
AM_SER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t
tableopts_ser_nr%.c: tableopts.l4 $(FLEX)
- $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ser_nr$*.ser.tables" $* -o $@ $<
+ $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ser_nr$*.ser.tables" $(subst _F,F,$*) -o $@ $<
-tableopts_ser_nr%.$(OBJEXT): tableopts_ser_nr%.c
+tableopts_ser_nr%.$(OBJEXT): tableopts_ser_nr%.c
$(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -c -o $@ $<
tableopts_ser_r%.c: tableopts.l4 $(FLEX)
- $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ser_r$*.ser.tables" $* -o $@ $<
+ $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) -R --tables-file="tableopts_ser_r$*.ser.tables" $(subst _F,F,$*) -o $@ $<
tableopts_ser_r%.$(OBJEXT): tableopts_ser_r%.c
$(AM_V_CC)$(COMPILE) -DTEST_HAS_TABLES_EXTERNAL -DTEST_IS_REENTRANT -c -o $@ $<
@@ -492,16 +492,16 @@ VER_LOG_COMPILER = $(SHELL) $(srcdir)/testwrapper.sh
AM_VER_LOG_FLAGS = -d $(builddir) -i $(srcdir)/tableopts.txt -r -t
tableopts_ver_nr%.c: tableopts.l4 $(FLEX)
- $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ver_nr$*.ver.tables" --tables-verify $* -o $@ $<
+ $(AM_V_LEX)$(FLEX) --unsafe-no-m4-sect3-escape -P $(subst -,_,$(basename $(*F))) --tables-file="tableopts_ver_nr$*.ver.tables" --tables-verify $(subst _F,F,$*) -o $@ $<
patch/flex-2.6.4.diff view on Meta::CPAN
+ $(am_tableopts_ver_r_C_F_ver_OBJECTS)
+tableopts_ver_r_C_F_ver_LDADD = $(LDADD)
am_tableopts_ver_r_Ca_ver_OBJECTS =
tableopts_ver_r_Ca_ver_OBJECTS = $(am_tableopts_ver_r_Ca_ver_OBJECTS)
tableopts_ver_r_Ca_ver_LDADD = $(LDADD)
@@ -620,10 +623,10 @@ am_tableopts_ver_r_Cae_ver_OBJECTS =
tableopts_ver_r_Cae_ver_OBJECTS = \
$(am_tableopts_ver_r_Cae_ver_OBJECTS)
tableopts_ver_r_Cae_ver_LDADD = $(LDADD)
-am_tableopts_ver_r_CaeF_ver_OBJECTS =
-tableopts_ver_r_CaeF_ver_OBJECTS = \
- $(am_tableopts_ver_r_CaeF_ver_OBJECTS)
-tableopts_ver_r_CaeF_ver_LDADD = $(LDADD)
+am_tableopts_ver_r_Cae_F_ver_OBJECTS =
+tableopts_ver_r_Cae_F_ver_OBJECTS = \
+ $(am_tableopts_ver_r_Cae_F_ver_OBJECTS)
+tableopts_ver_r_Cae_F_ver_LDADD = $(LDADD)
am_tableopts_ver_r_Caef_ver_OBJECTS =
tableopts_ver_r_Caef_ver_OBJECTS = \
$(am_tableopts_ver_r_Caef_ver_OBJECTS)
@@ -671,7 +674,47 @@ am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/alloc_extra.Po \
+ ./$(DEPDIR)/array_nr.Po ./$(DEPDIR)/array_r.Po \
+ ./$(DEPDIR)/basic_nr.Po ./$(DEPDIR)/basic_r.Po \
+ ./$(DEPDIR)/bison_nr_main.Po ./$(DEPDIR)/bison_nr_parser.Po \
+ ./$(DEPDIR)/bison_nr_scanner.Po \
+ ./$(DEPDIR)/bison_yylloc_main.Po \
+ ./$(DEPDIR)/bison_yylloc_parser.Po \
+ ./$(DEPDIR)/bison_yylloc_scanner.Po \
+ ./$(DEPDIR)/bison_yylval_main.Po \
+ ./$(DEPDIR)/bison_yylval_parser.Po \
+ ./$(DEPDIR)/bison_yylval_scanner.Po ./$(DEPDIR)/c_cxx_nr.Po \
+ ./$(DEPDIR)/c_cxx_r.Po ./$(DEPDIR)/ccl.Po \
+ ./$(DEPDIR)/cxx_basic.Po \
+ ./$(DEPDIR)/cxx_multiple_scanners_1.Po \
+ ./$(DEPDIR)/cxx_multiple_scanners_2.Po \
+ ./$(DEPDIR)/cxx_multiple_scanners_main.Po \
+ ./$(DEPDIR)/cxx_restart.Po ./$(DEPDIR)/cxx_yywrap.Po \
+ ./$(DEPDIR)/debug_nr.Po ./$(DEPDIR)/debug_r.Po \
+ ./$(DEPDIR)/extended.Po ./$(DEPDIR)/header_nr_main.Po \
+ ./$(DEPDIR)/header_nr_scanner.Po ./$(DEPDIR)/header_r_main.Po \
+ ./$(DEPDIR)/header_r_scanner.Po \
+ ./$(DEPDIR)/include_by_buffer.direct.Po \
+ ./$(DEPDIR)/include_by_push.direct.Po \
+ ./$(DEPDIR)/include_by_reentrant.direct.Po \
+ ./$(DEPDIR)/lineno_nr.Po ./$(DEPDIR)/lineno_r.Po \
+ ./$(DEPDIR)/lineno_trailing.Po ./$(DEPDIR)/mem_nr.Po \
+ ./$(DEPDIR)/mem_r.Po ./$(DEPDIR)/multiple_scanners_nr_1.Po \
+ ./$(DEPDIR)/multiple_scanners_nr_2.Po \
+ ./$(DEPDIR)/multiple_scanners_nr_main.Po \
+ ./$(DEPDIR)/multiple_scanners_r_1.Po \
+ ./$(DEPDIR)/multiple_scanners_r_2.Po \
+ ./$(DEPDIR)/multiple_scanners_r_main.Po \
+ ./$(DEPDIR)/no_bison_stub.Po ./$(DEPDIR)/posix.Po \
+ ./$(DEPDIR)/posixly_correct.Po ./$(DEPDIR)/prefix_nr.Po \
+ ./$(DEPDIR)/prefix_r.Po ./$(DEPDIR)/pthread.Po \
+ ./$(DEPDIR)/quote_in_comment.Po ./$(DEPDIR)/quotes.Po \
+ ./$(DEPDIR)/rescan_nr.direct.Po ./$(DEPDIR)/rescan_r.direct.Po \
+ ./$(DEPDIR)/string_nr.Po ./$(DEPDIR)/string_r.Po \
+ ./$(DEPDIR)/top.Po ./$(DEPDIR)/top_main.Po \
+ ./$(DEPDIR)/yyextra.Po
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -709,6 +752,7 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 =
+@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ ||
LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS)
LTLEXCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(LEX) $(AM_LFLAGS) $(LFLAGS)
@@ -717,6 +761,7 @@ am__v_LEX_ = $(am__v_LEX_@AM_DEFAULT_V@)
am__v_LEX_0 = @echo " LEX " $@;
am__v_LEX_1 =
YLWRAP = $(top_srcdir)/build-aux/ylwrap
+@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ ||
am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \
-e s/c++$$/h++/ -e s/c$$/h/
YACCCOMPILE = $(YACC) $(AM_YFLAGS) $(YFLAGS)
@@ -753,10 +798,10 @@ SOURCES = $(alloc_extra_SOURCES) $(array_nr_SOURCES) \
$(reject_ser_table_SOURCES) $(reject_ver_table_SOURCES) \
$(rescan_nr_direct_SOURCES) $(rescan_r_direct_SOURCES) \
$(string_nr_SOURCES) $(string_r_SOURCES) \
- $(tableopts_opt_nr_CF_opt_SOURCES) \
+ $(tableopts_opt_nr_C_F_opt_SOURCES) \
$(tableopts_opt_nr_Ca_opt_SOURCES) \
$(tableopts_opt_nr_Cae_opt_SOURCES) \
- $(tableopts_opt_nr_CaeF_opt_SOURCES) \
+ $(tableopts_opt_nr_Cae_F_opt_SOURCES) \
$(tableopts_opt_nr_Caef_opt_SOURCES) \
$(tableopts_opt_nr_Caem_opt_SOURCES) \
$(tableopts_opt_nr_Cam_opt_SOURCES) \
@@ -764,10 +809,10 @@ SOURCES = $(alloc_extra_SOURCES) $(array_nr_SOURCES) \
$(tableopts_opt_nr_Cem_opt_SOURCES) \
$(tableopts_opt_nr_Cf_opt_SOURCES) \
$(tableopts_opt_nr_Cm_opt_SOURCES) \
- $(tableopts_opt_r_CF_opt_SOURCES) \
+ $(tableopts_opt_r_C_F_opt_SOURCES) \
$(tableopts_opt_r_Ca_opt_SOURCES) \
$(tableopts_opt_r_Cae_opt_SOURCES) \
- $(tableopts_opt_r_CaeF_opt_SOURCES) \
+ $(tableopts_opt_r_Cae_F_opt_SOURCES) \
$(tableopts_opt_r_Caef_opt_SOURCES) \
$(tableopts_opt_r_Caem_opt_SOURCES) \
$(tableopts_opt_r_Cam_opt_SOURCES) \
@@ -775,10 +820,10 @@ SOURCES = $(alloc_extra_SOURCES) $(array_nr_SOURCES) \
$(tableopts_opt_r_Cem_opt_SOURCES) \
$(tableopts_opt_r_Cf_opt_SOURCES) \
$(tableopts_opt_r_Cm_opt_SOURCES) \
- $(tableopts_ser_nr_CF_ser_SOURCES) \
+ $(tableopts_ser_nr_C_F_ser_SOURCES) \
$(tableopts_ser_nr_Ca_ser_SOURCES) \
$(tableopts_ser_nr_Cae_ser_SOURCES) \
- $(tableopts_ser_nr_CaeF_ser_SOURCES) \
+ $(tableopts_ser_nr_Cae_F_ser_SOURCES) \
patch/flex-2.6.4.diff view on Meta::CPAN
- $(tableopts_ser_r_CaeF_ser_SOURCES) \
+ $(tableopts_ser_r_Cae_F_ser_SOURCES) \
$(tableopts_ser_r_Caef_ser_SOURCES) \
$(tableopts_ser_r_Caem_ser_SOURCES) \
$(tableopts_ser_r_Cam_ser_SOURCES) \
@@ -886,10 +931,10 @@ DIST_SOURCES = $(alloc_extra_SOURCES) $(array_nr_SOURCES) \
$(tableopts_ser_r_Cem_ser_SOURCES) \
$(tableopts_ser_r_Cf_ser_SOURCES) \
$(tableopts_ser_r_Cm_ser_SOURCES) \
- $(tableopts_ver_nr_CF_ver_SOURCES) \
+ $(tableopts_ver_nr_C_F_ver_SOURCES) \
$(tableopts_ver_nr_Ca_ver_SOURCES) \
$(tableopts_ver_nr_Cae_ver_SOURCES) \
- $(tableopts_ver_nr_CaeF_ver_SOURCES) \
+ $(tableopts_ver_nr_Cae_F_ver_SOURCES) \
$(tableopts_ver_nr_Caef_ver_SOURCES) \
$(tableopts_ver_nr_Caem_ver_SOURCES) \
$(tableopts_ver_nr_Cam_ver_SOURCES) \
@@ -897,10 +942,10 @@ DIST_SOURCES = $(alloc_extra_SOURCES) $(array_nr_SOURCES) \
$(tableopts_ver_nr_Cem_ver_SOURCES) \
$(tableopts_ver_nr_Cf_ver_SOURCES) \
$(tableopts_ver_nr_Cm_ver_SOURCES) \
- $(tableopts_ver_r_CF_ver_SOURCES) \
+ $(tableopts_ver_r_C_F_ver_SOURCES) \
$(tableopts_ver_r_Ca_ver_SOURCES) \
$(tableopts_ver_r_Cae_ver_SOURCES) \
- $(tableopts_ver_r_CaeF_ver_SOURCES) \
+ $(tableopts_ver_r_Cae_F_ver_SOURCES) \
$(tableopts_ver_r_Caef_ver_SOURCES) \
$(tableopts_ver_r_Caem_ver_SOURCES) \
$(tableopts_ver_r_Cam_ver_SOURCES) \
@@ -1227,6 +1272,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+FLEXexe = @FLEXexe@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
@@ -1259,6 +1305,7 @@ LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
M4 = @M4@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -1338,10 +1385,10 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -1640,135 +1687,135 @@ dist_check_SCRIPTS = \
pthread_pthread_LDADD = @LIBPTHREAD@
# specify how to process .l files in order to test the flex built by make all
-FLEX = $(top_builddir)/src/flex
+FLEX = $(FLEXexe)
tableopts_opt_nr_Ca_opt_SOURCES = tableopts.l4
tableopts_opt_nr_Ce_opt_SOURCES = tableopts.l4
tableopts_opt_nr_Cf_opt_SOURCES = tableopts.l4
-tableopts_opt_nr_CF_opt_SOURCES = tableopts.l4
+tableopts_opt_nr_C_F_opt_SOURCES = tableopts.l4
tableopts_opt_nr_Cm_opt_SOURCES = tableopts.l4
tableopts_opt_nr_Cem_opt_SOURCES = tableopts.l4
tableopts_opt_nr_Cae_opt_SOURCES = tableopts.l4
tableopts_opt_nr_Caef_opt_SOURCES = tableopts.l4
-tableopts_opt_nr_CaeF_opt_SOURCES = tableopts.l4
+tableopts_opt_nr_Cae_F_opt_SOURCES = tableopts.l4
tableopts_opt_nr_Cam_opt_SOURCES = tableopts.l4
tableopts_opt_nr_Caem_opt_SOURCES = tableopts.l4
tableopts_opt_r_Ca_opt_SOURCES = tableopts.l4
tableopts_opt_r_Ce_opt_SOURCES = tableopts.l4
tableopts_opt_r_Cf_opt_SOURCES = tableopts.l4
-tableopts_opt_r_CF_opt_SOURCES = tableopts.l4
+tableopts_opt_r_C_F_opt_SOURCES = tableopts.l4
tableopts_opt_r_Cm_opt_SOURCES = tableopts.l4
tableopts_opt_r_Cem_opt_SOURCES = tableopts.l4
tableopts_opt_r_Cae_opt_SOURCES = tableopts.l4
tableopts_opt_r_Caef_opt_SOURCES = tableopts.l4
-tableopts_opt_r_CaeF_opt_SOURCES = tableopts.l4
+tableopts_opt_r_Cae_F_opt_SOURCES = tableopts.l4
tableopts_opt_r_Cam_opt_SOURCES = tableopts.l4
tableopts_opt_r_Caem_opt_SOURCES = tableopts.l4
tableopts_ser_nr_Ca_ser_SOURCES = tableopts.l4
tableopts_ser_nr_Ce_ser_SOURCES = tableopts.l4
tableopts_ser_nr_Cf_ser_SOURCES = tableopts.l4
-tableopts_ser_nr_CF_ser_SOURCES = tableopts.l4
+tableopts_ser_nr_C_F_ser_SOURCES = tableopts.l4
tableopts_ser_nr_Cm_ser_SOURCES = tableopts.l4
tableopts_ser_nr_Cem_ser_SOURCES = tableopts.l4
tableopts_ser_nr_Cae_ser_SOURCES = tableopts.l4
tableopts_ser_nr_Caef_ser_SOURCES = tableopts.l4
-tableopts_ser_nr_CaeF_ser_SOURCES = tableopts.l4
+tableopts_ser_nr_Cae_F_ser_SOURCES = tableopts.l4
tableopts_ser_nr_Cam_ser_SOURCES = tableopts.l4
tableopts_ser_nr_Caem_ser_SOURCES = tableopts.l4
tableopts_ser_r_Ca_ser_SOURCES = tableopts.l4
tableopts_ser_r_Ce_ser_SOURCES = tableopts.l4
tableopts_ser_r_Cf_ser_SOURCES = tableopts.l4
-tableopts_ser_r_CF_ser_SOURCES = tableopts.l4
+tableopts_ser_r_C_F_ser_SOURCES = tableopts.l4
tableopts_ser_r_Cm_ser_SOURCES = tableopts.l4
tableopts_ser_r_Cem_ser_SOURCES = tableopts.l4
tableopts_ser_r_Cae_ser_SOURCES = tableopts.l4
tableopts_ser_r_Caef_ser_SOURCES = tableopts.l4
-tableopts_ser_r_CaeF_ser_SOURCES = tableopts.l4
+tableopts_ser_r_Cae_F_ser_SOURCES = tableopts.l4
tableopts_ser_r_Cam_ser_SOURCES = tableopts.l4
tableopts_ser_r_Caem_ser_SOURCES = tableopts.l4
tableopts_ver_nr_Ca_ver_SOURCES = tableopts.l4
tableopts_ver_nr_Ce_ver_SOURCES = tableopts.l4
tableopts_ver_nr_Cf_ver_SOURCES = tableopts.l4
-tableopts_ver_nr_CF_ver_SOURCES = tableopts.l4
patch/flex-2.6.4.diff view on Meta::CPAN
+ tableopts_ver_nr-Cf.ver tableopts_ver_nr-C_F.ver \
tableopts_ver_nr-Cm.ver tableopts_ver_nr-Cem.ver \
tableopts_ver_nr-Cae.ver tableopts_ver_nr-Caef.ver \
- tableopts_ver_nr-CaeF.ver tableopts_ver_nr-Cam.ver \
+ tableopts_ver_nr-Cae_F.ver tableopts_ver_nr-Cam.ver \
tableopts_ver_nr-Caem.ver tableopts_ver_r-Ca.ver \
tableopts_ver_r-Ce.ver tableopts_ver_r-Cf.ver \
- tableopts_ver_r-CF.ver tableopts_ver_r-Cm.ver \
+ tableopts_ver_r-C_F.ver tableopts_ver_r-Cm.ver \
tableopts_ver_r-Cem.ver tableopts_ver_r-Cae.ver \
- tableopts_ver_r-Caef.ver tableopts_ver_r-CaeF.ver \
+ tableopts_ver_r-Caef.ver tableopts_ver_r-Cae_F.ver \
tableopts_ver_r-Cam.ver tableopts_ver_r-Caem.ver
tableopts_tables = tableopts_ser_nr-Ca.ser.tables \
tableopts_ser_nr-Ce.ser.tables tableopts_ser_nr-Cf.ser.tables \
- tableopts_ser_nr-CF.ser.tables tableopts_ser_nr-Cm.ser.tables \
+ tableopts_ser_nr-C_F.ser.tables tableopts_ser_nr-Cm.ser.tables \
tableopts_ser_nr-Cem.ser.tables \
tableopts_ser_nr-Cae.ser.tables \
tableopts_ser_nr-Caef.ser.tables \
- tableopts_ser_nr-CaeF.ser.tables \
+ tableopts_ser_nr-Cae_F.ser.tables \
tableopts_ser_nr-Cam.ser.tables \
tableopts_ser_nr-Caem.ser.tables tableopts_ser_r-Ca.ser.tables \
tableopts_ser_r-Ce.ser.tables tableopts_ser_r-Cf.ser.tables \
- tableopts_ser_r-CF.ser.tables tableopts_ser_r-Cm.ser.tables \
+ tableopts_ser_r-C_F.ser.tables tableopts_ser_r-Cm.ser.tables \
tableopts_ser_r-Cem.ser.tables tableopts_ser_r-Cae.ser.tables \
tableopts_ser_r-Caef.ser.tables \
- tableopts_ser_r-CaeF.ser.tables tableopts_ser_r-Cam.ser.tables \
- tableopts_ser_r-Caem.ser.tables tableopts_ver_nr-Ca.ver.tables \
- tableopts_ver_nr-Ce.ver.tables tableopts_ver_nr-Cf.ver.tables \
- tableopts_ver_nr-CF.ver.tables tableopts_ver_nr-Cm.ver.tables \
- tableopts_ver_nr-Cem.ver.tables \
+ tableopts_ser_r-Cae_F.ser.tables \
+ tableopts_ser_r-Cam.ser.tables tableopts_ser_r-Caem.ser.tables \
+ tableopts_ver_nr-Ca.ver.tables tableopts_ver_nr-Ce.ver.tables \
+ tableopts_ver_nr-Cf.ver.tables tableopts_ver_nr-C_F.ver.tables \
+ tableopts_ver_nr-Cm.ver.tables tableopts_ver_nr-Cem.ver.tables \
tableopts_ver_nr-Cae.ver.tables \
tableopts_ver_nr-Caef.ver.tables \
- tableopts_ver_nr-CaeF.ver.tables \
+ tableopts_ver_nr-Cae_F.ver.tables \
tableopts_ver_nr-Cam.ver.tables \
tableopts_ver_nr-Caem.ver.tables tableopts_ver_r-Ca.ver.tables \
tableopts_ver_r-Ce.ver.tables tableopts_ver_r-Cf.ver.tables \
- tableopts_ver_r-CF.ver.tables tableopts_ver_r-Cm.ver.tables \
+ tableopts_ver_r-C_F.ver.tables tableopts_ver_r-Cm.ver.tables \
tableopts_ver_r-Cem.ver.tables tableopts_ver_r-Cae.ver.tables \
tableopts_ver_r-Caef.ver.tables \
- tableopts_ver_r-CaeF.ver.tables tableopts_ver_r-Cam.ver.tables \
- tableopts_ver_r-Caem.ver.tables
+ tableopts_ver_r-Cae_F.ver.tables \
+ tableopts_ver_r-Cam.ver.tables tableopts_ver_r-Caem.ver.tables
tableopts := -Ca -Ce -Cf -CF -Cm -Cem -Cae -Caef -CaeF -Cam -Caem
tableopts_opt_tests := $(foreach opt,$(tableopts), tableopts_opt_nr$(opt) tableopts_opt_r$(opt))
tableopts_sertests := $(foreach opt,$(tableopts), tableopts_ser_nr$(opt) tableopts_ser_r$(opt))
@@ -1785,7 +1832,7 @@ all: all-am
.SUFFIXES:
.SUFFIXES: .c .cc .cn .cn$(EXEEXT) .direct .direct$(EXEEXT) .i3 .i3$(EXEEXT) .l .ll .lll .lo .log .o .obj .one .one$(EXEEXT) .opt .opt$(EXEEXT) .pthread .pthread$(EXEEXT) .reject .reject$(EXEEXT) .ser .ser$(EXEEXT) .table .table$(EXEEXT) .trs .ver ....
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/tableopts.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/tableopts.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -1802,17 +1849,17 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
esac;
$(srcdir)/tableopts.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(top_srcdir)/configure: $(am__configure_deps)
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
@@ -2012,65 +2059,71 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc_extra.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array_nr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array_r.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_nr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_r.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_nr_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_nr_parser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_nr_scanner.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylloc_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylloc_parser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylloc_scanner.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylval_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylval_parser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylval_scanner.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c_cxx_nr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c_cxx_r.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_basic.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_multiple_scanners_1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_multiple_scanners_2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_multiple_scanners_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_restart.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_yywrap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug_nr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug_r.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extended.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_nr_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_nr_scanner.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_r_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_r_scanner.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/include_by_buffer.direct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/include_by_push.direct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/include_by_reentrant.direct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lineno_nr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lineno_r.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lineno_trailing.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem_nr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem_r.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_nr_1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_nr_2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_nr_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_r_1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_r_2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_r_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/no_bison_stub.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posixly_correct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefix_nr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefix_r.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quote_in_comment.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rescan_nr.direct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rescan_r.direct.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_nr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_r.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/top.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/top_main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yyextra.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alloc_extra.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array_nr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array_r.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_nr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic_r.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_nr_main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_nr_parser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_nr_scanner.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylloc_main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylloc_parser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylloc_scanner.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylval_main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylval_parser.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bison_yylval_scanner.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c_cxx_nr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c_cxx_r.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_basic.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_multiple_scanners_1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_multiple_scanners_2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_multiple_scanners_main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_restart.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx_yywrap.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug_nr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug_r.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extended.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_nr_main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_nr_scanner.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_r_main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/header_r_scanner.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/include_by_buffer.direct.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/include_by_push.direct.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/include_by_reentrant.direct.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lineno_nr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lineno_r.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lineno_trailing.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem_nr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem_r.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_nr_1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_nr_2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_nr_main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_r_1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_r_2.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiple_scanners_r_main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/no_bison_stub.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posix.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posixly_correct.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefix_nr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prefix_r.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quote_in_comment.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotes.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rescan_nr.direct.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rescan_r.direct.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_nr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string_r.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/top.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/top_main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yyextra.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+ @$(MKDIR_P) $(@D)
+ @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -2301,7 +2354,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
fi; \
$$success || exit 1
-check-TESTS:
+check-TESTS: $(check_PROGRAMS) $(dist_check_SCRIPTS)
@list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -2694,7 +2747,10 @@ yyextra.log: yyextra$(EXEEXT)
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_VER_LOG_DRIVER_FLAGS) $(VER_LOG_DRIVER_FLAGS) -- $(VER_LOG_COMPILE) \
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -2824,7 +2880,65 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
mostlyclean-am
distclean: distclean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/alloc_extra.Po
+ -rm -f ./$(DEPDIR)/array_nr.Po
+ -rm -f ./$(DEPDIR)/array_r.Po
+ -rm -f ./$(DEPDIR)/basic_nr.Po
+ -rm -f ./$(DEPDIR)/basic_r.Po
+ -rm -f ./$(DEPDIR)/bison_nr_main.Po
+ -rm -f ./$(DEPDIR)/bison_nr_parser.Po
+ -rm -f ./$(DEPDIR)/bison_nr_scanner.Po
+ -rm -f ./$(DEPDIR)/bison_yylloc_main.Po
+ -rm -f ./$(DEPDIR)/bison_yylloc_parser.Po
+ -rm -f ./$(DEPDIR)/bison_yylloc_scanner.Po
+ -rm -f ./$(DEPDIR)/bison_yylval_main.Po
+ -rm -f ./$(DEPDIR)/bison_yylval_parser.Po
+ -rm -f ./$(DEPDIR)/bison_yylval_scanner.Po
+ -rm -f ./$(DEPDIR)/c_cxx_nr.Po
+ -rm -f ./$(DEPDIR)/c_cxx_r.Po
+ -rm -f ./$(DEPDIR)/ccl.Po
+ -rm -f ./$(DEPDIR)/cxx_basic.Po
+ -rm -f ./$(DEPDIR)/cxx_multiple_scanners_1.Po
+ -rm -f ./$(DEPDIR)/cxx_multiple_scanners_2.Po
+ -rm -f ./$(DEPDIR)/cxx_multiple_scanners_main.Po
+ -rm -f ./$(DEPDIR)/cxx_restart.Po
+ -rm -f ./$(DEPDIR)/cxx_yywrap.Po
+ -rm -f ./$(DEPDIR)/debug_nr.Po
+ -rm -f ./$(DEPDIR)/debug_r.Po
+ -rm -f ./$(DEPDIR)/extended.Po
+ -rm -f ./$(DEPDIR)/header_nr_main.Po
+ -rm -f ./$(DEPDIR)/header_nr_scanner.Po
+ -rm -f ./$(DEPDIR)/header_r_main.Po
+ -rm -f ./$(DEPDIR)/header_r_scanner.Po
+ -rm -f ./$(DEPDIR)/include_by_buffer.direct.Po
+ -rm -f ./$(DEPDIR)/include_by_push.direct.Po
+ -rm -f ./$(DEPDIR)/include_by_reentrant.direct.Po
+ -rm -f ./$(DEPDIR)/lineno_nr.Po
+ -rm -f ./$(DEPDIR)/lineno_r.Po
+ -rm -f ./$(DEPDIR)/lineno_trailing.Po
+ -rm -f ./$(DEPDIR)/mem_nr.Po
+ -rm -f ./$(DEPDIR)/mem_r.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_nr_1.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_nr_2.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_nr_main.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_r_1.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_r_2.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_r_main.Po
+ -rm -f ./$(DEPDIR)/no_bison_stub.Po
+ -rm -f ./$(DEPDIR)/posix.Po
+ -rm -f ./$(DEPDIR)/posixly_correct.Po
+ -rm -f ./$(DEPDIR)/prefix_nr.Po
+ -rm -f ./$(DEPDIR)/prefix_r.Po
+ -rm -f ./$(DEPDIR)/pthread.Po
+ -rm -f ./$(DEPDIR)/quote_in_comment.Po
+ -rm -f ./$(DEPDIR)/quotes.Po
+ -rm -f ./$(DEPDIR)/rescan_nr.direct.Po
+ -rm -f ./$(DEPDIR)/rescan_r.direct.Po
+ -rm -f ./$(DEPDIR)/string_nr.Po
+ -rm -f ./$(DEPDIR)/string_r.Po
+ -rm -f ./$(DEPDIR)/top.Po
+ -rm -f ./$(DEPDIR)/top_main.Po
+ -rm -f ./$(DEPDIR)/yyextra.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -2870,7 +2984,65 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
+ -rm -f ./$(DEPDIR)/alloc_extra.Po
+ -rm -f ./$(DEPDIR)/array_nr.Po
+ -rm -f ./$(DEPDIR)/array_r.Po
+ -rm -f ./$(DEPDIR)/basic_nr.Po
+ -rm -f ./$(DEPDIR)/basic_r.Po
+ -rm -f ./$(DEPDIR)/bison_nr_main.Po
+ -rm -f ./$(DEPDIR)/bison_nr_parser.Po
+ -rm -f ./$(DEPDIR)/bison_nr_scanner.Po
+ -rm -f ./$(DEPDIR)/bison_yylloc_main.Po
+ -rm -f ./$(DEPDIR)/bison_yylloc_parser.Po
+ -rm -f ./$(DEPDIR)/bison_yylloc_scanner.Po
+ -rm -f ./$(DEPDIR)/bison_yylval_main.Po
+ -rm -f ./$(DEPDIR)/bison_yylval_parser.Po
+ -rm -f ./$(DEPDIR)/bison_yylval_scanner.Po
+ -rm -f ./$(DEPDIR)/c_cxx_nr.Po
+ -rm -f ./$(DEPDIR)/c_cxx_r.Po
+ -rm -f ./$(DEPDIR)/ccl.Po
+ -rm -f ./$(DEPDIR)/cxx_basic.Po
+ -rm -f ./$(DEPDIR)/cxx_multiple_scanners_1.Po
+ -rm -f ./$(DEPDIR)/cxx_multiple_scanners_2.Po
+ -rm -f ./$(DEPDIR)/cxx_multiple_scanners_main.Po
+ -rm -f ./$(DEPDIR)/cxx_restart.Po
+ -rm -f ./$(DEPDIR)/cxx_yywrap.Po
+ -rm -f ./$(DEPDIR)/debug_nr.Po
+ -rm -f ./$(DEPDIR)/debug_r.Po
+ -rm -f ./$(DEPDIR)/extended.Po
+ -rm -f ./$(DEPDIR)/header_nr_main.Po
+ -rm -f ./$(DEPDIR)/header_nr_scanner.Po
+ -rm -f ./$(DEPDIR)/header_r_main.Po
+ -rm -f ./$(DEPDIR)/header_r_scanner.Po
+ -rm -f ./$(DEPDIR)/include_by_buffer.direct.Po
+ -rm -f ./$(DEPDIR)/include_by_push.direct.Po
+ -rm -f ./$(DEPDIR)/include_by_reentrant.direct.Po
+ -rm -f ./$(DEPDIR)/lineno_nr.Po
+ -rm -f ./$(DEPDIR)/lineno_r.Po
+ -rm -f ./$(DEPDIR)/lineno_trailing.Po
+ -rm -f ./$(DEPDIR)/mem_nr.Po
+ -rm -f ./$(DEPDIR)/mem_r.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_nr_1.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_nr_2.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_nr_main.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_r_1.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_r_2.Po
+ -rm -f ./$(DEPDIR)/multiple_scanners_r_main.Po
+ -rm -f ./$(DEPDIR)/no_bison_stub.Po
+ -rm -f ./$(DEPDIR)/posix.Po
+ -rm -f ./$(DEPDIR)/posixly_correct.Po
+ -rm -f ./$(DEPDIR)/prefix_nr.Po
+ -rm -f ./$(DEPDIR)/prefix_r.Po
+ -rm -f ./$(DEPDIR)/pthread.Po
+ -rm -f ./$(DEPDIR)/quote_in_comment.Po
+ -rm -f ./$(DEPDIR)/quotes.Po
+ -rm -f ./$(DEPDIR)/rescan_nr.direct.Po
+ -rm -f ./$(DEPDIR)/rescan_r.direct.Po
+ -rm -f ./$(DEPDIR)/string_nr.Po
+ -rm -f ./$(DEPDIR)/string_r.Po
+ -rm -f ./$(DEPDIR)/top.Po
+ -rm -f ./$(DEPDIR)/top_main.Po
+ -rm -f ./$(DEPDIR)/yyextra.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -2891,19 +3063,20 @@ uninstall-am:
.MAKE: check-am install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
- clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
- ctags ctags-am dist-hook distclean distclean-compile \
- distclean-generic distclean-libtool distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- recheck tags tags-am uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+ check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
+ cscopelist-am ctags ctags-am dist-hook distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am recheck tags tags-am uninstall \
+ uninstall-am
.PRECIOUS: Makefile
@@ -3023,7 +3196,7 @@ top.h: top.c
# things) and the resultant list is both long an unenlightening. And
# it can be / is generated by a shell script, tableopts.sh.
-tableopts.am: tableopts.sh
+$(srcdir)/tableopts.am: tableopts.sh
$(SHELL) $(srcdir)/tableopts.sh > $(srcdir)/tableopts.am
tableopts_opt_nr-Ca.opt$(EXEEXT): tableopts_opt_nr-Ca.$(OBJEXT)
@@ -3035,7 +3208,7 @@ tableopts_opt_nr-Ce.opt$(EXEEXT): tableopts_opt_nr-Ce.$(OBJEXT)
tableopts_opt_nr-Cf.opt$(EXEEXT): tableopts_opt_nr-Cf.$(OBJEXT)
$(AM_V_CCLD)$(LINK) -o $@ $<
-tableopts_opt_nr-CF.opt$(EXEEXT): tableopts_opt_nr-CF.$(OBJEXT)
patch/flex-2.6.4.diff view on Meta::CPAN
-tableopts_ver_nr_CF_ver_SOURCES = tableopts.l4
+tableopts_ver_nr_C_F_ver_SOURCES = tableopts.l4
-tableopts_ver_nr-CF.ver$(EXEEXT): tableopts_ver_nr-CF.$(OBJEXT)
+tableopts_ver_nr-C_F.ver$(EXEEXT): tableopts_ver_nr-C_F.$(OBJEXT)
$(AM_V_CCLD)$(LINK) -o $@ $<
tableopts_ver_nr_Cm_ver_SOURCES = tableopts.l4
@@ -258,9 +258,9 @@ tableopts_ver_nr_Caef_ver_SOURCES = tableopts.l4
tableopts_ver_nr-Caef.ver$(EXEEXT): tableopts_ver_nr-Caef.$(OBJEXT)
$(AM_V_CCLD)$(LINK) -o $@ $<
-tableopts_ver_nr_CaeF_ver_SOURCES = tableopts.l4
+tableopts_ver_nr_Cae_F_ver_SOURCES = tableopts.l4
-tableopts_ver_nr-CaeF.ver$(EXEEXT): tableopts_ver_nr-CaeF.$(OBJEXT)
+tableopts_ver_nr-Cae_F.ver$(EXEEXT): tableopts_ver_nr-Cae_F.$(OBJEXT)
$(AM_V_CCLD)$(LINK) -o $@ $<
tableopts_ver_nr_Cam_ver_SOURCES = tableopts.l4
@@ -288,9 +288,9 @@ tableopts_ver_r_Cf_ver_SOURCES = tableopts.l4
tableopts_ver_r-Cf.ver$(EXEEXT): tableopts_ver_r-Cf.$(OBJEXT)
$(AM_V_CCLD)$(LINK) -o $@ $<
-tableopts_ver_r_CF_ver_SOURCES = tableopts.l4
+tableopts_ver_r_C_F_ver_SOURCES = tableopts.l4
-tableopts_ver_r-CF.ver$(EXEEXT): tableopts_ver_r-CF.$(OBJEXT)
+tableopts_ver_r-C_F.ver$(EXEEXT): tableopts_ver_r-C_F.$(OBJEXT)
$(AM_V_CCLD)$(LINK) -o $@ $<
tableopts_ver_r_Cm_ver_SOURCES = tableopts.l4
@@ -313,9 +313,9 @@ tableopts_ver_r_Caef_ver_SOURCES = tableopts.l4
tableopts_ver_r-Caef.ver$(EXEEXT): tableopts_ver_r-Caef.$(OBJEXT)
$(AM_V_CCLD)$(LINK) -o $@ $<
-tableopts_ver_r_CaeF_ver_SOURCES = tableopts.l4
+tableopts_ver_r_Cae_F_ver_SOURCES = tableopts.l4
-tableopts_ver_r-CaeF.ver$(EXEEXT): tableopts_ver_r-CaeF.$(OBJEXT)
+tableopts_ver_r-Cae_F.ver$(EXEEXT): tableopts_ver_r-Cae_F.$(OBJEXT)
$(AM_V_CCLD)$(LINK) -o $@ $<
tableopts_ver_r_Cam_ver_SOURCES = tableopts.l4
@@ -328,6 +328,6 @@ tableopts_ver_r_Caem_ver_SOURCES = tableopts.l4
tableopts_ver_r-Caem.ver$(EXEEXT): tableopts_ver_r-Caem.$(OBJEXT)
$(AM_V_CCLD)$(LINK) -o $@ $<
-TABLEOPTS_TESTS = tableopts_opt_nr-Ca.opt tableopts_opt_nr-Ce.opt tableopts_opt_nr-Cf.opt tableopts_opt_nr-CF.opt tableopts_opt_nr-Cm.opt tableopts_opt_nr-Cem.opt tableopts_opt_nr-Cae.opt tableopts_opt_nr-Caef.opt tableopts_opt_nr-CaeF.opt tableopts...
+TABLEOPTS_TESTS = tableopts_opt_nr-Ca.opt tableopts_opt_nr-Ce.opt tableopts_opt_nr-Cf.opt tableopts_opt_nr-C_F.opt tableopts_opt_nr-Cm.opt tableopts_opt_nr-Cem.opt tableopts_opt_nr-Cae.opt tableopts_opt_nr-Caef.opt tableopts_opt_nr-Cae_F.opt tableop...
-tableopts_tables = tableopts_ser_nr-Ca.ser.tables tableopts_ser_nr-Ce.ser.tables tableopts_ser_nr-Cf.ser.tables tableopts_ser_nr-CF.ser.tables tableopts_ser_nr-Cm.ser.tables tableopts_ser_nr-Cem.ser.tables tableopts_ser_nr-Cae.ser.tables tableopts_...
+tableopts_tables = tableopts_ser_nr-Ca.ser.tables tableopts_ser_nr-Ce.ser.tables tableopts_ser_nr-Cf.ser.tables tableopts_ser_nr-C_F.ser.tables tableopts_ser_nr-Cm.ser.tables tableopts_ser_nr-Cem.ser.tables tableopts_ser_nr-Cae.ser.tables tableopts...
diff --git a/tests/tableopts.sh b/tests/tableopts.sh
index c1ac19e..497829e 100755
--- a/tests/tableopts.sh
+++ b/tests/tableopts.sh
@@ -17,7 +17,11 @@ tableopts_tables=""
for kind in opt ser ver ; do
for threading in nr r ; do
for opt in -Ca -Ce -Cf -CF -Cm -Cem -Cae -Caef -CaeF -Cam -Caem ; do
- testname=tableopts_${kind}_${threading}${opt}.${kind}
+ bare_opt=${opt#-}
+ # The filenames must work on case-insensitive filesystems.
+ bare_opt=`echo ${bare_opt}| sed 's/F$/_F/'`
+
+ testname=tableopts_${kind}_${threading}-${bare_opt}.${kind}
if [ "${TABLEOPTS_TESTS}" = "" ] ;then
TABLEOPTS_TESTS=${testname}
if [ "$kind" = "ser" ] || [ "$kind" = "ver" ] ; then
@@ -30,11 +34,10 @@ for kind in opt ser ver ; do
fi
fi
- bare_opt=${opt#-}
cat << EOF
tableopts_${kind}_${threading}_${bare_opt}_${kind}_SOURCES = tableopts.l4
-${testname}\$(EXEEXT): tableopts_${kind}_${threading}${opt}.\$(OBJEXT)
+${testname}\$(EXEEXT): tableopts_${kind}_${threading}-${bare_opt}.\$(OBJEXT)
\$(AM_V_CCLD)\$(LINK) -o \$@ \$<
EOF
diff --git a/tests/testwrapper-direct.sh b/tests/testwrapper-direct.sh
index 589ad33..9160501 100755
--- a/tests/testwrapper-direct.sh
+++ b/tests/testwrapper-direct.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-set -vx
+echo 'set -euvx'
set -euvx
# testwrapper-direct.sh: run some specialized flex tests that care where
diff --git a/tests/testwrapper.sh b/tests/testwrapper.sh
index 6a7e666..293f8cc 100755
--- a/tests/testwrapper.sh
+++ b/tests/testwrapper.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-set -vx
+echo 'set -euvx'
set -euvx
# testwrapper.sh: run a flex test, typically called by a Makefile
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 3e2ddff..daeaab4 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -163,6 +163,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+FLEXexe = @FLEXexe@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
@@ -195,6 +196,7 @@ LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
M4 = @M4@
+MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
@@ -274,10 +276,10 @@ mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
( run in 0.587 second using v1.01-cache-2.11-cpan-df04353d9ac )