--- embedaddon/confuse/tests/Makefile.in	2017/01/24 14:48:56	1.1
+++ embedaddon/confuse/tests/Makefile.in	2021/03/17 00:49:17	1.1.1.2
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  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,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,54 +87,126 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-TESTS = suite_single$(EXEEXT) suite_dup$(EXEEXT) suite_func$(EXEEXT) \
-	suite_list$(EXEEXT) suite_validate$(EXEEXT) \
+TESTS = keyval$(EXEEXT) suite_single$(EXEEXT) suite_dup$(EXEEXT) \
+	suite_func$(EXEEXT) suite_list$(EXEEXT) \
+	suite_validate$(EXEEXT) suite_ptr$(EXEEXT) \
 	list_plus_syntax$(EXEEXT) section_title_dupes$(EXEEXT) \
-	single_title_sections$(EXEEXT) quote_before_print$(EXEEXT) \
-	include$(EXEEXT)
+	single_title_sections$(EXEEXT) section_remove$(EXEEXT) \
+	section_add$(EXEEXT) section_getopt$(EXEEXT) \
+	quote_before_print$(EXEEXT) include$(EXEEXT) \
+	searchpath$(EXEEXT) env$(EXEEXT) ignore_parm$(EXEEXT) \
+	annotate$(EXEEXT) empty_string$(EXEEXT) setopt_ptr$(EXEEXT) \
+	setmulti_reset$(EXEEXT) print_filter$(EXEEXT) \
+	modified_flag$(EXEEXT)
 check_PROGRAMS = $(am__EXEEXT_1)
 subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
-	$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
+	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
+	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = suite_single$(EXEEXT) suite_dup$(EXEEXT) \
-	suite_func$(EXEEXT) suite_list$(EXEEXT) \
-	suite_validate$(EXEEXT) list_plus_syntax$(EXEEXT) \
-	section_title_dupes$(EXEEXT) single_title_sections$(EXEEXT) \
-	quote_before_print$(EXEEXT) include$(EXEEXT)
+am__EXEEXT_1 = keyval$(EXEEXT) suite_single$(EXEEXT) \
+	suite_dup$(EXEEXT) suite_func$(EXEEXT) suite_list$(EXEEXT) \
+	suite_validate$(EXEEXT) suite_ptr$(EXEEXT) \
+	list_plus_syntax$(EXEEXT) section_title_dupes$(EXEEXT) \
+	single_title_sections$(EXEEXT) section_remove$(EXEEXT) \
+	section_add$(EXEEXT) section_getopt$(EXEEXT) \
+	quote_before_print$(EXEEXT) include$(EXEEXT) \
+	searchpath$(EXEEXT) env$(EXEEXT) ignore_parm$(EXEEXT) \
+	annotate$(EXEEXT) empty_string$(EXEEXT) setopt_ptr$(EXEEXT) \
+	setmulti_reset$(EXEEXT) print_filter$(EXEEXT) \
+	modified_flag$(EXEEXT)
+annotate_SOURCES = annotate.c
+annotate_OBJECTS = annotate.$(OBJEXT)
+annotate_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+annotate_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+empty_string_SOURCES = empty_string.c
+empty_string_OBJECTS = empty_string.$(OBJEXT)
+empty_string_LDADD = $(LDADD)
+empty_string_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
+env_SOURCES = env.c
+env_OBJECTS = env.$(OBJEXT)
+env_LDADD = $(LDADD)
+env_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
+ignore_parm_SOURCES = ignore_parm.c
+ignore_parm_OBJECTS = ignore_parm.$(OBJEXT)
+ignore_parm_LDADD = $(LDADD)
+ignore_parm_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
 include_SOURCES = include.c
 include_OBJECTS = include.$(OBJEXT)
 include_LDADD = $(LDADD)
-am__DEPENDENCIES_1 =
 include_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
+keyval_SOURCES = keyval.c
+keyval_OBJECTS = keyval.$(OBJEXT)
+keyval_LDADD = $(LDADD)
+keyval_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
 list_plus_syntax_SOURCES = list_plus_syntax.c
 list_plus_syntax_OBJECTS = list_plus_syntax.$(OBJEXT)
 list_plus_syntax_LDADD = $(LDADD)
 list_plus_syntax_DEPENDENCIES = ../src/libconfuse.la \
 	$(am__DEPENDENCIES_1)
+modified_flag_SOURCES = modified_flag.c
+modified_flag_OBJECTS = modified_flag.$(OBJEXT)
+modified_flag_LDADD = $(LDADD)
+modified_flag_DEPENDENCIES = ../src/libconfuse.la \
+	$(am__DEPENDENCIES_1)
+print_filter_SOURCES = print_filter.c
+print_filter_OBJECTS = print_filter.$(OBJEXT)
+print_filter_LDADD = $(LDADD)
+print_filter_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
 quote_before_print_SOURCES = quote_before_print.c
 quote_before_print_OBJECTS = quote_before_print.$(OBJEXT)
 quote_before_print_LDADD = $(LDADD)
 quote_before_print_DEPENDENCIES = ../src/libconfuse.la \
 	$(am__DEPENDENCIES_1)
+searchpath_SOURCES = searchpath.c
+searchpath_OBJECTS = searchpath.$(OBJEXT)
+searchpath_LDADD = $(LDADD)
+searchpath_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
+section_add_SOURCES = section_add.c
+section_add_OBJECTS = section_add.$(OBJEXT)
+section_add_LDADD = $(LDADD)
+section_add_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
+section_getopt_SOURCES = section_getopt.c
+section_getopt_OBJECTS = section_getopt.$(OBJEXT)
+section_getopt_LDADD = $(LDADD)
+section_getopt_DEPENDENCIES = ../src/libconfuse.la \
+	$(am__DEPENDENCIES_1)
+section_remove_SOURCES = section_remove.c
+section_remove_OBJECTS = section_remove.$(OBJEXT)
+section_remove_LDADD = $(LDADD)
+section_remove_DEPENDENCIES = ../src/libconfuse.la \
+	$(am__DEPENDENCIES_1)
 section_title_dupes_SOURCES = section_title_dupes.c
 section_title_dupes_OBJECTS = section_title_dupes.$(OBJEXT)
 section_title_dupes_LDADD = $(LDADD)
 section_title_dupes_DEPENDENCIES = ../src/libconfuse.la \
 	$(am__DEPENDENCIES_1)
+setmulti_reset_SOURCES = setmulti_reset.c
+setmulti_reset_OBJECTS = setmulti_reset.$(OBJEXT)
+setmulti_reset_LDADD = $(LDADD)
+setmulti_reset_DEPENDENCIES = ../src/libconfuse.la \
+	$(am__DEPENDENCIES_1)
+setopt_ptr_SOURCES = setopt_ptr.c
+setopt_ptr_OBJECTS = setopt_ptr.$(OBJEXT)
+setopt_ptr_LDADD = $(LDADD)
+setopt_ptr_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
 single_title_sections_SOURCES = single_title_sections.c
 single_title_sections_OBJECTS = single_title_sections.$(OBJEXT)
 single_title_sections_LDADD = $(LDADD)
@@ -98,6 +224,10 @@ suite_list_SOURCES = suite_list.c
 suite_list_OBJECTS = suite_list.$(OBJEXT)
 suite_list_LDADD = $(LDADD)
 suite_list_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
+suite_ptr_SOURCES = suite_ptr.c
+suite_ptr_OBJECTS = suite_ptr.$(OBJEXT)
+suite_ptr_LDADD = $(LDADD)
+suite_ptr_DEPENDENCIES = ../src/libconfuse.la $(am__DEPENDENCIES_1)
 suite_single_SOURCES = suite_single.c
 suite_single_OBJECTS = suite_single.$(OBJEXT)
 suite_single_LDADD = $(LDADD)
@@ -107,33 +237,304 @@ suite_validate_OBJECTS = suite_validate.$(OBJEXT)
 suite_validate_LDADD = $(LDADD)
 suite_validate_DEPENDENCIES = ../src/libconfuse.la \
 	$(am__DEPENDENCIES_1)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/support/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/annotate.Po \
+	./$(DEPDIR)/empty_string.Po ./$(DEPDIR)/env.Po \
+	./$(DEPDIR)/ignore_parm.Po ./$(DEPDIR)/include.Po \
+	./$(DEPDIR)/keyval.Po ./$(DEPDIR)/list_plus_syntax.Po \
+	./$(DEPDIR)/modified_flag.Po ./$(DEPDIR)/print_filter.Po \
+	./$(DEPDIR)/quote_before_print.Po ./$(DEPDIR)/searchpath.Po \
+	./$(DEPDIR)/section_add.Po ./$(DEPDIR)/section_getopt.Po \
+	./$(DEPDIR)/section_remove.Po \
+	./$(DEPDIR)/section_title_dupes.Po \
+	./$(DEPDIR)/setmulti_reset.Po ./$(DEPDIR)/setopt_ptr.Po \
+	./$(DEPDIR)/single_title_sections.Po ./$(DEPDIR)/suite_dup.Po \
+	./$(DEPDIR)/suite_func.Po ./$(DEPDIR)/suite_list.Po \
+	./$(DEPDIR)/suite_ptr.Po ./$(DEPDIR)/suite_single.Po \
+	./$(DEPDIR)/suite_validate.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = include.c list_plus_syntax.c quote_before_print.c \
-	section_title_dupes.c single_title_sections.c suite_dup.c \
-	suite_func.c suite_list.c suite_single.c suite_validate.c
-DIST_SOURCES = include.c list_plus_syntax.c quote_before_print.c \
-	section_title_dupes.c single_title_sections.c suite_dup.c \
-	suite_func.c suite_list.c suite_single.c suite_validate.c
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = annotate.c empty_string.c env.c ignore_parm.c include.c \
+	keyval.c list_plus_syntax.c modified_flag.c print_filter.c \
+	quote_before_print.c searchpath.c section_add.c \
+	section_getopt.c section_remove.c section_title_dupes.c \
+	setmulti_reset.c setopt_ptr.c single_title_sections.c \
+	suite_dup.c suite_func.c suite_list.c suite_ptr.c \
+	suite_single.c suite_validate.c
+DIST_SOURCES = annotate.c empty_string.c env.c ignore_parm.c include.c \
+	keyval.c list_plus_syntax.c modified_flag.c print_filter.c \
+	quote_before_print.c searchpath.c section_add.c \
+	section_getopt.c section_remove.c section_title_dupes.c \
+	setmulti_reset.c setopt_ptr.c single_title_sections.c \
+	suite_dup.c suite_func.c suite_list.c suite_ptr.c \
+	suite_single.c suite_validate.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__recheck_rx = ^[ 	]*:recheck:[ 	]*
+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
+# A command that, given a newline-separated list of test names on the
+# standard input, print the name of the tests that are to be re-run
+# upon "make recheck".
+am__list_recheck_tests = $(AWK) '{ \
+  recheck = 1; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+        { \
+          if ((getline line2 < ($$0 ".log")) < 0) \
+	    recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+        { \
+          recheck = 0; \
+          break; \
+        } \
+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+        { \
+          break; \
+        } \
+    }; \
+  if (recheck) \
+    print $$0; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# A command that, given a newline-separated list of test names on the
+# standard input, create the global log from their .trs and .log files.
+am__create_global_log = $(AWK) ' \
+function fatal(msg) \
+{ \
+  print "fatal: making $@: " msg | "cat >&2"; \
+  exit 1; \
+} \
+function rst_section(header) \
+{ \
+  print header; \
+  len = length(header); \
+  for (i = 1; i <= len; i = i + 1) \
+    printf "="; \
+  printf "\n\n"; \
+} \
+{ \
+  copy_in_global_log = 1; \
+  global_test_result = "RUN"; \
+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+    { \
+      if (rc < 0) \
+         fatal("failed to read from " $$0 ".trs"); \
+      if (line ~ /$(am__global_test_result_rx)/) \
+        { \
+          sub("$(am__global_test_result_rx)", "", line); \
+          sub("[ 	]*$$", "", line); \
+          global_test_result = line; \
+        } \
+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+        copy_in_global_log = 0; \
+    }; \
+  if (copy_in_global_log) \
+    { \
+      rst_section(global_test_result ": " $$0); \
+      while ((rc = (getline line < ($$0 ".log"))) != 0) \
+      { \
+        if (rc < 0) \
+          fatal("failed to read from " $$0 ".log"); \
+        print line; \
+      }; \
+      printf "\n"; \
+    }; \
+  close ($$0 ".trs"); \
+  close ($$0 ".log"); \
+}'
+# Restructured Text title.
+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+# Solaris 10 'make', and several other traditional 'make' implementations,
+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
+# by disabling -e (using the XSI extension "set +e") if it's set.
+am__sh_e_setup = case $$- in *e*) set +e;; esac
+# Default flags passed to test drivers.
+am__common_driver_flags = \
+  --color-tests "$$am__color_tests" \
+  --enable-hard-errors "$$am__enable_hard_errors" \
+  --expect-failure "$$am__expect_failure"
+# To be inserted before the command running the test.  Creates the
+# directory for the log if needed.  Stores in $dir the directory
+# containing $f, in $tst the test, in $log the log.  Executes the
+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
+# will run the test scripts (or their associated LOG_COMPILER, if
+# thy have one).
+am__check_pre = \
+$(am__sh_e_setup);					\
+$(am__vpath_adj_setup) $(am__vpath_adj)			\
+$(am__tty_colors);					\
+srcdir=$(srcdir); export srcdir;			\
+case "$@" in						\
+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
+    *) am__odir=.;; 					\
+esac;							\
+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
+if test -f "./$$f"; then dir=./;			\
+elif test -f "$$f"; then dir=;				\
+else dir="$(srcdir)/"; fi;				\
+tst=$$dir$$f; log='$@'; 				\
+if test -n '$(DISABLE_HARD_ERRORS)'; then		\
+  am__enable_hard_errors=no; 				\
+else							\
+  am__enable_hard_errors=yes; 				\
+fi; 							\
+case " $(XFAIL_TESTS) " in				\
+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
+    am__expect_failure=yes;;				\
+  *)							\
+    am__expect_failure=no;;				\
+esac; 							\
+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+# A shell command to get the names of the tests scripts with any registered
+# extension removed (i.e., equivalently, the names of the test logs, with
+# the '.log' extension removed).  The result is saved in the shell variable
+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+# since that might cause problem with VPATH rewrites for suffix-less tests.
+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+am__set_TESTS_bases = \
+  bases='$(TEST_LOGS)'; \
+  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+  bases=`echo $$bases`
+RECHECK_LOGS = $(TEST_LOGS)
+AM_RECURSIVE_TARGETS = check recheck
+TEST_SUITE_LOG = test-suite.log
+TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/support/test-driver
+LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
+am__set_b = \
+  case '$@' in \
+    */*) \
+      case '$*' in \
+        */*) b='$*';; \
+          *) b=`echo '$@' | sed 's/\.log$$//'`; \
+       esac;; \
+    *) \
+      b='$*';; \
+  esac
+am__test_logs1 = $(TESTS:=.log)
+am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
+TEST_LOGS = $(am__test_logs2:.test.log=.log)
+TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/support/test-driver
+TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+	$(TEST_LOG_FLAGS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/support/depcomp \
+	$(top_srcdir)/support/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -146,6 +547,7 @@ CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = -DSRC_DIR='"$(srcdir)"'
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -154,6 +556,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
@@ -165,7 +568,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = -static
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
@@ -179,8 +582,9 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
@@ -209,10 +613,12 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
@@ -245,7 +651,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -253,6 +658,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -261,14 +667,14 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+EXTRA_DIST = annotate.conf a.conf b.conf spdir check_confuse.h
 LDADD = -L../src ../src/libconfuse.la $(LTLIBINTL)
-EXTRA_DIST = a.conf b.conf check_confuse.h
 CLEANFILES = *~
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -277,25 +683,24 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/Makefile
-.PRECIOUS: Makefile
+	  $(AUTOMAKE) --foreign tests/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *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;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
@@ -307,36 +712,102 @@ clean-checkPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-include$(EXEEXT): $(include_OBJECTS) $(include_DEPENDENCIES) 
+
+annotate$(EXEEXT): $(annotate_OBJECTS) $(annotate_DEPENDENCIES) $(EXTRA_annotate_DEPENDENCIES) 
+	@rm -f annotate$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(annotate_OBJECTS) $(annotate_LDADD) $(LIBS)
+
+empty_string$(EXEEXT): $(empty_string_OBJECTS) $(empty_string_DEPENDENCIES) $(EXTRA_empty_string_DEPENDENCIES) 
+	@rm -f empty_string$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(empty_string_OBJECTS) $(empty_string_LDADD) $(LIBS)
+
+env$(EXEEXT): $(env_OBJECTS) $(env_DEPENDENCIES) $(EXTRA_env_DEPENDENCIES) 
+	@rm -f env$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(env_OBJECTS) $(env_LDADD) $(LIBS)
+
+ignore_parm$(EXEEXT): $(ignore_parm_OBJECTS) $(ignore_parm_DEPENDENCIES) $(EXTRA_ignore_parm_DEPENDENCIES) 
+	@rm -f ignore_parm$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(ignore_parm_OBJECTS) $(ignore_parm_LDADD) $(LIBS)
+
+include$(EXEEXT): $(include_OBJECTS) $(include_DEPENDENCIES) $(EXTRA_include_DEPENDENCIES) 
 	@rm -f include$(EXEEXT)
-	$(LINK) $(include_OBJECTS) $(include_LDADD) $(LIBS)
-list_plus_syntax$(EXEEXT): $(list_plus_syntax_OBJECTS) $(list_plus_syntax_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) $(include_OBJECTS) $(include_LDADD) $(LIBS)
+
+keyval$(EXEEXT): $(keyval_OBJECTS) $(keyval_DEPENDENCIES) $(EXTRA_keyval_DEPENDENCIES) 
+	@rm -f keyval$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(keyval_OBJECTS) $(keyval_LDADD) $(LIBS)
+
+list_plus_syntax$(EXEEXT): $(list_plus_syntax_OBJECTS) $(list_plus_syntax_DEPENDENCIES) $(EXTRA_list_plus_syntax_DEPENDENCIES) 
 	@rm -f list_plus_syntax$(EXEEXT)
-	$(LINK) $(list_plus_syntax_OBJECTS) $(list_plus_syntax_LDADD) $(LIBS)
-quote_before_print$(EXEEXT): $(quote_before_print_OBJECTS) $(quote_before_print_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) $(list_plus_syntax_OBJECTS) $(list_plus_syntax_LDADD) $(LIBS)
+
+modified_flag$(EXEEXT): $(modified_flag_OBJECTS) $(modified_flag_DEPENDENCIES) $(EXTRA_modified_flag_DEPENDENCIES) 
+	@rm -f modified_flag$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(modified_flag_OBJECTS) $(modified_flag_LDADD) $(LIBS)
+
+print_filter$(EXEEXT): $(print_filter_OBJECTS) $(print_filter_DEPENDENCIES) $(EXTRA_print_filter_DEPENDENCIES) 
+	@rm -f print_filter$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(print_filter_OBJECTS) $(print_filter_LDADD) $(LIBS)
+
+quote_before_print$(EXEEXT): $(quote_before_print_OBJECTS) $(quote_before_print_DEPENDENCIES) $(EXTRA_quote_before_print_DEPENDENCIES) 
 	@rm -f quote_before_print$(EXEEXT)
-	$(LINK) $(quote_before_print_OBJECTS) $(quote_before_print_LDADD) $(LIBS)
-section_title_dupes$(EXEEXT): $(section_title_dupes_OBJECTS) $(section_title_dupes_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) $(quote_before_print_OBJECTS) $(quote_before_print_LDADD) $(LIBS)
+
+searchpath$(EXEEXT): $(searchpath_OBJECTS) $(searchpath_DEPENDENCIES) $(EXTRA_searchpath_DEPENDENCIES) 
+	@rm -f searchpath$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(searchpath_OBJECTS) $(searchpath_LDADD) $(LIBS)
+
+section_add$(EXEEXT): $(section_add_OBJECTS) $(section_add_DEPENDENCIES) $(EXTRA_section_add_DEPENDENCIES) 
+	@rm -f section_add$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(section_add_OBJECTS) $(section_add_LDADD) $(LIBS)
+
+section_getopt$(EXEEXT): $(section_getopt_OBJECTS) $(section_getopt_DEPENDENCIES) $(EXTRA_section_getopt_DEPENDENCIES) 
+	@rm -f section_getopt$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(section_getopt_OBJECTS) $(section_getopt_LDADD) $(LIBS)
+
+section_remove$(EXEEXT): $(section_remove_OBJECTS) $(section_remove_DEPENDENCIES) $(EXTRA_section_remove_DEPENDENCIES) 
+	@rm -f section_remove$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(section_remove_OBJECTS) $(section_remove_LDADD) $(LIBS)
+
+section_title_dupes$(EXEEXT): $(section_title_dupes_OBJECTS) $(section_title_dupes_DEPENDENCIES) $(EXTRA_section_title_dupes_DEPENDENCIES) 
 	@rm -f section_title_dupes$(EXEEXT)
-	$(LINK) $(section_title_dupes_OBJECTS) $(section_title_dupes_LDADD) $(LIBS)
-single_title_sections$(EXEEXT): $(single_title_sections_OBJECTS) $(single_title_sections_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) $(section_title_dupes_OBJECTS) $(section_title_dupes_LDADD) $(LIBS)
+
+setmulti_reset$(EXEEXT): $(setmulti_reset_OBJECTS) $(setmulti_reset_DEPENDENCIES) $(EXTRA_setmulti_reset_DEPENDENCIES) 
+	@rm -f setmulti_reset$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(setmulti_reset_OBJECTS) $(setmulti_reset_LDADD) $(LIBS)
+
+setopt_ptr$(EXEEXT): $(setopt_ptr_OBJECTS) $(setopt_ptr_DEPENDENCIES) $(EXTRA_setopt_ptr_DEPENDENCIES) 
+	@rm -f setopt_ptr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(setopt_ptr_OBJECTS) $(setopt_ptr_LDADD) $(LIBS)
+
+single_title_sections$(EXEEXT): $(single_title_sections_OBJECTS) $(single_title_sections_DEPENDENCIES) $(EXTRA_single_title_sections_DEPENDENCIES) 
 	@rm -f single_title_sections$(EXEEXT)
-	$(LINK) $(single_title_sections_OBJECTS) $(single_title_sections_LDADD) $(LIBS)
-suite_dup$(EXEEXT): $(suite_dup_OBJECTS) $(suite_dup_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) $(single_title_sections_OBJECTS) $(single_title_sections_LDADD) $(LIBS)
+
+suite_dup$(EXEEXT): $(suite_dup_OBJECTS) $(suite_dup_DEPENDENCIES) $(EXTRA_suite_dup_DEPENDENCIES) 
 	@rm -f suite_dup$(EXEEXT)
-	$(LINK) $(suite_dup_OBJECTS) $(suite_dup_LDADD) $(LIBS)
-suite_func$(EXEEXT): $(suite_func_OBJECTS) $(suite_func_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) $(suite_dup_OBJECTS) $(suite_dup_LDADD) $(LIBS)
+
+suite_func$(EXEEXT): $(suite_func_OBJECTS) $(suite_func_DEPENDENCIES) $(EXTRA_suite_func_DEPENDENCIES) 
 	@rm -f suite_func$(EXEEXT)
-	$(LINK) $(suite_func_OBJECTS) $(suite_func_LDADD) $(LIBS)
-suite_list$(EXEEXT): $(suite_list_OBJECTS) $(suite_list_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) $(suite_func_OBJECTS) $(suite_func_LDADD) $(LIBS)
+
+suite_list$(EXEEXT): $(suite_list_OBJECTS) $(suite_list_DEPENDENCIES) $(EXTRA_suite_list_DEPENDENCIES) 
 	@rm -f suite_list$(EXEEXT)
-	$(LINK) $(suite_list_OBJECTS) $(suite_list_LDADD) $(LIBS)
-suite_single$(EXEEXT): $(suite_single_OBJECTS) $(suite_single_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) $(suite_list_OBJECTS) $(suite_list_LDADD) $(LIBS)
+
+suite_ptr$(EXEEXT): $(suite_ptr_OBJECTS) $(suite_ptr_DEPENDENCIES) $(EXTRA_suite_ptr_DEPENDENCIES) 
+	@rm -f suite_ptr$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(suite_ptr_OBJECTS) $(suite_ptr_LDADD) $(LIBS)
+
+suite_single$(EXEEXT): $(suite_single_OBJECTS) $(suite_single_DEPENDENCIES) $(EXTRA_suite_single_DEPENDENCIES) 
 	@rm -f suite_single$(EXEEXT)
-	$(LINK) $(suite_single_OBJECTS) $(suite_single_LDADD) $(LIBS)
-suite_validate$(EXEEXT): $(suite_validate_OBJECTS) $(suite_validate_DEPENDENCIES) 
+	$(AM_V_CCLD)$(LINK) $(suite_single_OBJECTS) $(suite_single_LDADD) $(LIBS)
+
+suite_validate$(EXEEXT): $(suite_validate_OBJECTS) $(suite_validate_DEPENDENCIES) $(EXTRA_suite_validate_DEPENDENCIES) 
 	@rm -f suite_validate$(EXEEXT)
-	$(LINK) $(suite_validate_OBJECTS) $(suite_validate_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(suite_validate_OBJECTS) $(suite_validate_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -344,37 +815,57 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/include.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list_plus_syntax.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quote_before_print.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/section_title_dupes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/single_title_sections.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_dup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_func.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_list.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_single.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_validate.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/annotate.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/empty_string.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ignore_parm.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/include.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyval.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list_plus_syntax.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modified_flag.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print_filter.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quote_before_print.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/searchpath.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/section_add.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/section_getopt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/section_remove.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/section_title_dupes.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setmulti_reset.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setopt_ptr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/single_title_sections.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_dup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_func.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_list.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_ptr.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_single.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/suite_validate.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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -382,26 +873,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -413,15 +893,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -430,103 +906,353 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
-	srcdir=$(srcdir); export srcdir; \
-	list=' $(TESTS) '; \
-	$(am__tty_colors); \
-	if test -n "$$list"; then \
-	  for tst in $$list; do \
-	    if test -f ./$$tst; then dir=./; \
-	    elif test -f $$tst; then dir=; \
-	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xpass=`expr $$xpass + 1`; \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=XPASS; \
-	      ;; \
-	      *) \
-		col=$$grn; res=PASS; \
-	      ;; \
-	      esac; \
-	    elif test $$? -ne 77; then \
-	      all=`expr $$all + 1`; \
-	      case " $(XFAIL_TESTS) " in \
-	      *[\ \	]$$tst[\ \	]*) \
-		xfail=`expr $$xfail + 1`; \
-		col=$$lgn; res=XFAIL; \
-	      ;; \
-	      *) \
-		failed=`expr $$failed + 1`; \
-		col=$$red; res=FAIL; \
-	      ;; \
-	      esac; \
-	    else \
-	      skip=`expr $$skip + 1`; \
-	      col=$$blu; res=SKIP; \
-	    fi; \
-	    echo "$${col}$$res$${std}: $$tst"; \
-	  done; \
-	  if test "$$all" -eq 1; then \
-	    tests="test"; \
-	    All=""; \
-	  else \
-	    tests="tests"; \
-	    All="All "; \
+# Recover from deleted '.trs' file; this should ensure that
+# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
+# to avoid problems with "make -n".
+.log.trs:
+	rm -f $< $@
+	$(MAKE) $(AM_MAKEFLAGS) $<
+
+# Leading 'am--fnord' is there to ensure the list of targets does not
+# expand to empty, as could happen e.g. with make check TESTS=''.
+am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+am--force-recheck:
+	@:
+
+$(TEST_SUITE_LOG): $(TEST_LOGS)
+	@$(am__set_TESTS_bases); \
+	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+	redo_bases=`for i in $$bases; do \
+	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+	            done`; \
+	if test -n "$$redo_bases"; then \
+	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+	  if $(am__make_dryrun); then :; else \
+	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
-	  if test "$$failed" -eq 0; then \
-	    if test "$$xfail" -eq 0; then \
-	      banner="$$All$$all $$tests passed"; \
+	fi; \
+	if test -n "$$am__remaking_logs"; then \
+	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+	       "recursion detected" >&2; \
+	elif test -n "$$redo_logs"; then \
+	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	fi; \
+	if $(am__make_dryrun); then :; else \
+	  st=0;  \
+	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+	  for i in $$redo_bases; do \
+	    test -f $$i.trs && test -r $$i.trs \
+	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+	    test -f $$i.log && test -r $$i.log \
+	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
+	  done; \
+	  test $$st -eq 0 || exit 1; \
+	fi
+	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+	ws='[ 	]'; \
+	results=`for b in $$bases; do echo $$b.trs; done`; \
+	test -n "$$results" || results=/dev/null; \
+	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
+	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
+	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
+	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
+	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+	  success=true; \
+	else \
+	  success=false; \
+	fi; \
+	br='==================='; br=$$br$$br$$br$$br; \
+	result_count () \
+	{ \
+	    if test x"$$1" = x"--maybe-color"; then \
+	      maybe_colorize=yes; \
+	    elif test x"$$1" = x"--no-color"; then \
+	      maybe_colorize=no; \
 	    else \
-	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
-	  else \
-	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all $$tests failed"; \
+	    shift; \
+	    desc=$$1 count=$$2; \
+	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
+	      color_start=$$3 color_end=$$std; \
 	    else \
-	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	      color_start= color_end=; \
 	    fi; \
-	  fi; \
-	  dashes="$$banner"; \
-	  skipped=""; \
-	  if test "$$skip" -ne 0; then \
-	    if test "$$skip" -eq 1; then \
-	      skipped="($$skip test was not run)"; \
-	    else \
-	      skipped="($$skip tests were not run)"; \
-	    fi; \
-	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$skipped"; \
-	  fi; \
-	  report=""; \
-	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
-	    report="Please report to $(PACKAGE_BUGREPORT)"; \
-	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
-	      dashes="$$report"; \
-	  fi; \
-	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
-	  else \
-	    echo "$$red$$dashes"; \
-	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
-	  test "$$failed" -eq 0; \
-	else :; fi
+	    echo "$${color_start}# $$desc $$count$${color_end}"; \
+	}; \
+	create_testsuite_report () \
+	{ \
+	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
+	  result_count $$1 "PASS: " $$pass  "$$grn"; \
+	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
+	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+	  result_count $$1 "FAIL: " $$fail  "$$red"; \
+	  result_count $$1 "XPASS:" $$xpass "$$red"; \
+	  result_count $$1 "ERROR:" $$error "$$mgn"; \
+	}; \
+	{								\
+	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
+	    $(am__rst_title);						\
+	  create_testsuite_report --no-color;				\
+	  echo;								\
+	  echo ".. contents:: :depth: 2";				\
+	  echo;								\
+	  for b in $$bases; do echo $$b; done				\
+	    | $(am__create_global_log);					\
+	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
+	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
+	if $$success; then						\
+	  col="$$grn";							\
+	 else								\
+	  col="$$red";							\
+	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
+	fi;								\
+	echo "$${col}$$br$${std}"; 					\
+	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}$$br$${std}"; 					\
+	create_testsuite_report --maybe-color;				\
+	echo "$$col$$br$$std";						\
+	if $$success; then :; else					\
+	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
+	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
+	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
+	  fi;								\
+	  echo "$$col$$br$$std";					\
+	fi;								\
+	$$success || exit 1
 
-distdir: $(DISTFILES)
+check-TESTS: $(check_PROGRAMS)
+	@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)
+	@set +e; $(am__set_TESTS_bases); \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+	exit $$?;
+recheck: all $(check_PROGRAMS)
+	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+	@set +e; $(am__set_TESTS_bases); \
+	bases=`for i in $$bases; do echo $$i; done \
+	         | $(am__list_recheck_tests)` || exit 1; \
+	log_list=`for i in $$bases; do echo $$i.log; done`; \
+	log_list=`echo $$log_list`; \
+	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+	        am__force_recheck=am--force-recheck \
+	        TEST_LOGS="$$log_list"; \
+	exit $$?
+keyval.log: keyval$(EXEEXT)
+	@p='keyval$(EXEEXT)'; \
+	b='keyval'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+suite_single.log: suite_single$(EXEEXT)
+	@p='suite_single$(EXEEXT)'; \
+	b='suite_single'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+suite_dup.log: suite_dup$(EXEEXT)
+	@p='suite_dup$(EXEEXT)'; \
+	b='suite_dup'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+suite_func.log: suite_func$(EXEEXT)
+	@p='suite_func$(EXEEXT)'; \
+	b='suite_func'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+suite_list.log: suite_list$(EXEEXT)
+	@p='suite_list$(EXEEXT)'; \
+	b='suite_list'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+suite_validate.log: suite_validate$(EXEEXT)
+	@p='suite_validate$(EXEEXT)'; \
+	b='suite_validate'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+suite_ptr.log: suite_ptr$(EXEEXT)
+	@p='suite_ptr$(EXEEXT)'; \
+	b='suite_ptr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+list_plus_syntax.log: list_plus_syntax$(EXEEXT)
+	@p='list_plus_syntax$(EXEEXT)'; \
+	b='list_plus_syntax'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+section_title_dupes.log: section_title_dupes$(EXEEXT)
+	@p='section_title_dupes$(EXEEXT)'; \
+	b='section_title_dupes'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+single_title_sections.log: single_title_sections$(EXEEXT)
+	@p='single_title_sections$(EXEEXT)'; \
+	b='single_title_sections'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+section_remove.log: section_remove$(EXEEXT)
+	@p='section_remove$(EXEEXT)'; \
+	b='section_remove'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+section_add.log: section_add$(EXEEXT)
+	@p='section_add$(EXEEXT)'; \
+	b='section_add'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+section_getopt.log: section_getopt$(EXEEXT)
+	@p='section_getopt$(EXEEXT)'; \
+	b='section_getopt'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+quote_before_print.log: quote_before_print$(EXEEXT)
+	@p='quote_before_print$(EXEEXT)'; \
+	b='quote_before_print'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+include.log: include$(EXEEXT)
+	@p='include$(EXEEXT)'; \
+	b='include'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+searchpath.log: searchpath$(EXEEXT)
+	@p='searchpath$(EXEEXT)'; \
+	b='searchpath'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+env.log: env$(EXEEXT)
+	@p='env$(EXEEXT)'; \
+	b='env'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+ignore_parm.log: ignore_parm$(EXEEXT)
+	@p='ignore_parm$(EXEEXT)'; \
+	b='ignore_parm'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+annotate.log: annotate$(EXEEXT)
+	@p='annotate$(EXEEXT)'; \
+	b='annotate'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+empty_string.log: empty_string$(EXEEXT)
+	@p='empty_string$(EXEEXT)'; \
+	b='empty_string'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+setopt_ptr.log: setopt_ptr$(EXEEXT)
+	@p='setopt_ptr$(EXEEXT)'; \
+	b='setopt_ptr'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+setmulti_reset.log: setmulti_reset$(EXEEXT)
+	@p='setmulti_reset$(EXEEXT)'; \
+	b='setmulti_reset'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+print_filter.log: print_filter$(EXEEXT)
+	@p='print_filter$(EXEEXT)'; \
+	b='print_filter'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+modified_flag.log: modified_flag$(EXEEXT)
+	@p='modified_flag$(EXEEXT)'; \
+	b='modified_flag'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+.test.log:
+	@p='$<'; \
+	$(am__set_b); \
+	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+@am__EXEEXT_TRUE@.test$(EXEEXT).log:
+@am__EXEEXT_TRUE@	@p='$<'; \
+@am__EXEEXT_TRUE@	$(am__set_b); \
+@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
+@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
+@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+
+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)'; \
@@ -572,11 +1298,19 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
+	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
@@ -594,7 +1328,30 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libt
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/annotate.Po
+	-rm -f ./$(DEPDIR)/empty_string.Po
+	-rm -f ./$(DEPDIR)/env.Po
+	-rm -f ./$(DEPDIR)/ignore_parm.Po
+	-rm -f ./$(DEPDIR)/include.Po
+	-rm -f ./$(DEPDIR)/keyval.Po
+	-rm -f ./$(DEPDIR)/list_plus_syntax.Po
+	-rm -f ./$(DEPDIR)/modified_flag.Po
+	-rm -f ./$(DEPDIR)/print_filter.Po
+	-rm -f ./$(DEPDIR)/quote_before_print.Po
+	-rm -f ./$(DEPDIR)/searchpath.Po
+	-rm -f ./$(DEPDIR)/section_add.Po
+	-rm -f ./$(DEPDIR)/section_getopt.Po
+	-rm -f ./$(DEPDIR)/section_remove.Po
+	-rm -f ./$(DEPDIR)/section_title_dupes.Po
+	-rm -f ./$(DEPDIR)/setmulti_reset.Po
+	-rm -f ./$(DEPDIR)/setopt_ptr.Po
+	-rm -f ./$(DEPDIR)/single_title_sections.Po
+	-rm -f ./$(DEPDIR)/suite_dup.Po
+	-rm -f ./$(DEPDIR)/suite_func.Po
+	-rm -f ./$(DEPDIR)/suite_list.Po
+	-rm -f ./$(DEPDIR)/suite_ptr.Po
+	-rm -f ./$(DEPDIR)/suite_single.Po
+	-rm -f ./$(DEPDIR)/suite_validate.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -640,7 +1397,30 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/annotate.Po
+	-rm -f ./$(DEPDIR)/empty_string.Po
+	-rm -f ./$(DEPDIR)/env.Po
+	-rm -f ./$(DEPDIR)/ignore_parm.Po
+	-rm -f ./$(DEPDIR)/include.Po
+	-rm -f ./$(DEPDIR)/keyval.Po
+	-rm -f ./$(DEPDIR)/list_plus_syntax.Po
+	-rm -f ./$(DEPDIR)/modified_flag.Po
+	-rm -f ./$(DEPDIR)/print_filter.Po
+	-rm -f ./$(DEPDIR)/quote_before_print.Po
+	-rm -f ./$(DEPDIR)/searchpath.Po
+	-rm -f ./$(DEPDIR)/section_add.Po
+	-rm -f ./$(DEPDIR)/section_getopt.Po
+	-rm -f ./$(DEPDIR)/section_remove.Po
+	-rm -f ./$(DEPDIR)/section_title_dupes.Po
+	-rm -f ./$(DEPDIR)/setmulti_reset.Po
+	-rm -f ./$(DEPDIR)/setopt_ptr.Po
+	-rm -f ./$(DEPDIR)/single_title_sections.Po
+	-rm -f ./$(DEPDIR)/suite_dup.Po
+	-rm -f ./$(DEPDIR)/suite_func.Po
+	-rm -f ./$(DEPDIR)/suite_list.Po
+	-rm -f ./$(DEPDIR)/suite_ptr.Po
+	-rm -f ./$(DEPDIR)/suite_single.Po
+	-rm -f ./$(DEPDIR)/suite_validate.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -661,22 +1441,22 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool ctags \
-	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 \
+.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 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 \
-	tags uninstall uninstall-am
+	recheck tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
 
-celan: clean
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.