branch master updated: * doc/refcard/Makefile, doc/refcard/Makefile.am: Change file to Makefile.am. This means we can put the information about what files to distribute in this file, rather than in doc/Makefile.am. * doc/Makefile.am: Update.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new beb34124ca * doc/refcard/Makefile, doc/refcard/Makefile.am: Change 
file to Makefile.am.  This means we can put the information about what files to 
distribute in this file, rather than in doc/Makefile.am. * doc/Makefile.am: 
Update.
beb34124ca is described below

commit beb34124ca09a7e6650694d65189955b92fc643d
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Oct 19 14:48:02 2023 +0100

    * doc/refcard/Makefile, doc/refcard/Makefile.am:
    Change file to Makefile.am.  This means we can put the information
    about what files to distribute in this file, rather than in
    doc/Makefile.am.
    * doc/Makefile.am: Update.
---
 ChangeLog                             |  8 ++++++++
 configure.ac                          |  1 +
 doc/Makefile.am                       | 10 +---------
 doc/refcard/{Makefile => Makefile.am} | 19 ++++++++-----------
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d4ad259625..6d29aec35e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-10-19  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * doc/refcard/Makefile, doc/refcard/Makefile.am:
+       Change file to Makefile.am.  This means we can put the information
+       about what files to distribute in this file, rather than in
+       doc/Makefile.am.
+       * doc/Makefile.am: Update.
+
 2023-10-19  Gavin Smith <gavinsmith0123@gmail.com>
 
        * info/info.c (get_initial_file),
diff --git a/configure.ac b/configure.ac
index 303d3faeda..5364a0a7dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -581,6 +581,7 @@ AC_SUBST([HOST_IS_WINDOWS_VARIABLE])
 AC_CONFIG_FILES([\
   Makefile
   doc/Makefile
+  doc/refcard/Makefile
   doc/tp_api/Makefile
   gnulib/lib/Makefile
   info/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4bb09bc4e5..e76371baca 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -13,7 +13,7 @@
 # The links to texi2any_internals require that to avoid many warnings
 AM_MAKEINFOFLAGS = -c INFO_SPECIAL_CHARS_WARNING=0
 
-SUBDIRS = tp_api
+SUBDIRS = tp_api refcard
 
 info_TEXINFOS = texinfo.texi info-stnd.texi texi2any_api.texi
 texinfo_TEXINFOS = pod2texi.texi
@@ -53,18 +53,10 @@ TXI_XLATE = txi-ca.tex txi-cs.tex txi-de.tex txi-en.tex 
txi-es.tex \
            txi-pt.tex txi-ru.tex txi-sr.tex txi-tr.tex txi-uk.tex \
            txi-zh.tex
 
-refcard_files = refcard/Makefile refcard/txicmdcheck \
-                refcard/txirefcard-a4.pdf refcard/txirefcard.pdf \
-               refcard/txirefcard.tex
-
-refcard/txirefcard.pdf refcard/txirefcard-a4.pdf: refcard/txirefcard.tex
-       cd $(srcdir)/refcard && make
-
 # Include our texinfo.tex, not Automake's.
 EXTRA_DIST = epsf.tex texinfo.tex \
              fdl.texi \
             $(man_MANS) $(TXI_XLATE) \
-             $(refcard_files) \
             texinfo-tex-test.texi texinfo-tex-test.WIDOWs \
              texinfo-ja.tex short-sample-ja.texi \
              texinfo-zh.tex short-sample-zh.texi
diff --git a/doc/refcard/Makefile b/doc/refcard/Makefile.am
similarity index 79%
rename from doc/refcard/Makefile
rename to doc/refcard/Makefile.am
index 08a0c58c9d..4dc8e27bde 100644
--- a/doc/refcard/Makefile
+++ b/doc/refcard/Makefile.am
@@ -1,6 +1,4 @@
-# Makefile for texinfo/doc/refcard.
-# This is not hooked into Automake, just conveniences for working on the
-# refcard.
+# Makefile.am for texinfo/doc/refcard.
 #
 # Copyright 2008-2023 Free Software Foundation, Inc.
 #
@@ -12,9 +10,13 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
+
+refcard_files = txicmdcheck txirefcard-a4.pdf txirefcard.pdf txirefcard.tex
+
+EXTRA_DIST = $(refcard_files)
+
 doc = txirefcard
 
-# parallel makes, etc., will fail.
 all: $(doc).pdf $(doc)-a4.pdf
 
 # trying to get it work with pdftex isn't worth the trouble.
@@ -28,8 +30,6 @@ $(doc)-a4.pdf: $(doc).tex
        dvips -t landscape -t a4 $(doc) -o
        ps2pdf $(doc).ps $@
 
-check: ccheck vcheck
-
 ccheck:
        ./txicmdcheck $(txi_check_args)
 
@@ -40,8 +40,5 @@ spell:
        aspell list --mode=tex --add-extra-dicts=`pwd`/refcard.spell \
        < $(doc).tex | sort -f -u
 
-clean:
-       rm -f $(doc)*.dvi $(doc)*.log $(doc)*.ps
-
-distclean: clean
-       rm -f $(doc)*.pdf
+clean-local:
+       rm -f $(doc)*.dvi $(doc)*.log $(doc)*.ps $(doc)*.pdf