[groff] 05/05: Ship tests in distribution archive.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit f2f261e8db3f5c24ea5b520480b82556f380121b
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Sep 27 12:03:20 2020 +1000

    Ship tests in distribution archive.
    
    * src/preproc/preconv/preconv.am (EXTRA_DIST):
    * src/roff/groff/groff.am (EXTRA_DIST):
    * src/roff/nroff/nroff.am (EXTRA_DIST):
    * tmac/tmac.am (EXTRA_DIST): Add $({preconv,groff,nroff,tmac}_TESTS), as
      appropriate.
    
    * src/roff/nroff/nroff.am (MOSTLYCLEANFILES): Stop adding
      $(nroff_TESTS), which can only have unhappy consequences.
    
    Also clean up trailing whitespace and make comment headers mutually
    consistent.
---
 ChangeLog                      | 13 +++++++++++++
 src/preproc/preconv/preconv.am |  1 +
 src/roff/groff/groff.am        | 13 +++++++------
 src/roff/nroff/nroff.am        |  5 +----
 tmac/tmac.am                   |  3 ++-
 5 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 153910e..a2a2f1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2020-09-27  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       Ship tests in distribution archive.
+
+       * src/preproc/preconv/preconv.am (EXTRA_DIST):
+       * src/roff/groff/groff.am (EXTRA_DIST):
+       * src/roff/nroff/nroff.am (EXTRA_DIST):
+       * tmac/tmac.am (EXTRA_DIST): Add
+       $({preconv,groff,nroff,tmac}_TESTS), as appropriate.
+
+       * src/roff/nroff/nroff.am (MOSTLYCLEANFILES): Stop adding
+       $(nroff_TESTS), which can only have unhappy consequences.
+
+2020-09-27  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * tmac/tmac.am: Fix problem with recently-relocated mdoc macro
        files not ending up in the right place in the distribution
        archive.
diff --git a/src/preproc/preconv/preconv.am b/src/preproc/preconv/preconv.am
index 02313f8..10d6288 100644
--- a/src/preproc/preconv/preconv.am
+++ b/src/preproc/preconv/preconv.am
@@ -26,6 +26,7 @@ EXTRA_DIST += src/preproc/preconv/preconv.1.man
 preconv_TESTS = \
   src/preproc/preconv/tests/smoke-test.sh
 TESTS += $(preconv_TESTS)
+EXTRA_DIST += $(preconv_TESTS)
 
 
 # Local Variables:
diff --git a/src/roff/groff/groff.am b/src/roff/groff/groff.am
index 0089c1b..c70047d 100644
--- a/src/roff/groff/groff.am
+++ b/src/roff/groff/groff.am
@@ -1,18 +1,20 @@
 # Copyright (C) 1993-2018 Free Software Foundation, Inc.
 #
-#   Original Makefile.sub rewritten by 
+#   Original Makefile.sub rewritten by
 #   Bernd Warken <groff-bernd.warken-72@web.de>
 #   and Werner LEMBERG <wl@gnu.org>
 #
-#   Automake migration by 
+#   Automake migration by
 #   Bertrand Garrigues <bertrand.garrigues@laposte.net>
 #
-# 'groff' is free software; you can redistribute it and/or modify it
+# This file is part of groff.
+#
+# groff is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# 'groff' is distributed in the hope that it will be useful, but
+# groff is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
@@ -20,8 +22,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-########################################################################
-
 bin_PROGRAMS += groff
 groff_LDADD = \
   libgroff.a \
@@ -54,6 +54,7 @@ groff_TESTS = \
   src/roff/groff/tests/string_case_xform_unicode_escape.sh \
   src/roff/groff/tests/use_point_size_escape_with_single_digit_arg.sh
 TESTS += $(groff_TESTS)
+EXTRA_DIST += $(groff_TESTS)
 
 groff_XFAIL_TESTS = \
   src/roff/groff/tests/string_case_xform_unicode_escape.sh
diff --git a/src/roff/nroff/nroff.am b/src/roff/nroff/nroff.am
index 7504f9c..50393b7 100644
--- a/src/roff/nroff/nroff.am
+++ b/src/roff/nroff/nroff.am
@@ -14,8 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-########################################################################
 
 prefixexecbin_SCRIPTS += nroff
 nroff_srcdir = $(top_srcdir)/src/roff/nroff
@@ -27,8 +25,7 @@ EXTRA_DIST += \
 nroff_TESTS = \
   src/roff/nroff/tests/verbose_option_works.sh
 TESTS += $(nroff_TESTS)
-
-MOSTLYCLEANFILES += $(nroff_TESTS)
+EXTRA_DIST += $(nroff_TESTS)
 
 nroff: $(nroff_srcdir)/nroff.sh $(SH_DEPS_SED_SCRIPT)
        $(AM_V_GEN)rm -f $@ \
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 8b383df..44eb541 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -16,6 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 tmac_srcdir = $(top_srcdir)/tmac
 tmac_builddir = $(top_builddir)/tmac
 
@@ -172,13 +173,13 @@ tmac_TESTS = \
   tmac/tests/doc-accept-mixed-case-section-headings.sh \
   tmac/tests/doc-smoke-test.sh
 TESTS += $(tmac_TESTS)
+EXTRA_DIST += $(tmac_TESTS)
 
 tmac_XFAIL_TESTS = \
   tmac/tests/an-ext_ME_punct_hyphenates.sh \
   tmac/tests/an-ext_UE_punct_hyphenates.sh
 XFAIL_TESTS += $(tmac_XFAIL_TESTS)
 
-
 $(TMACSTRIPFILES): $(TMACUNSTRIPFILES)
        for f in $(TMACSTRIPFILES); do \
           sed -f $(tmac_srcdir)/strip.sed $(top_srcdir)/$$f-u \