[groff] 02/18: Rename and drop some Make macros.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit a5af2f4d0f0064e96db78abb3d4675c2e15357da
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Mar 23 19:35:53 2022 +1100

    Rename and drop some Make macros.
    
    * Makefile.am: Rename `TFLAG` macro, which means "tmac flag", to
      `MFLAG`, because it expands to `-M` options to groff, not the `-T`
      option, which can be bewildering.
    
    * doc/doc.am (DOC_GROFF): Update expansion site.
    
    * contrib/hdtbl/hdtbl.am: Eliminate `HDTBL_TFLAG` and `HDTBL_PFLAG` Make
      macros; they were expanded in only one place.
    
      (HDTBLGROFF): Track rename of Make macro `TFLAG` to `MFLAG`.
    
    * contrib/mom/mom.am: Eliminate `MOM_TFLAG` and `MOM_PFLAG` Make macros;
      they were expanded in only one place.
    
      (MOMPDFMOM): Track rename of Make macro `TFLAG` to `MFLAG`.
    
    * contrib/pdfmark/pdfmark.am: Eliminate `PDFMARK_TFLAG` and
      `PDFMARK_PFLAG` Make macros; they were expanded in only one place.
    
      (PDFROFF): Track rename of Make macro `TFLAG` to `MFLAG`.
---
 ChangeLog                  | 7 +++++++
 Makefile.am                | 5 +++--
 contrib/hdtbl/ChangeLog    | 6 ++++++
 contrib/hdtbl/hdtbl.am     | 4 +---
 contrib/mom/ChangeLog      | 6 ++++++
 contrib/mom/mom.am         | 4 +---
 contrib/pdfmark/ChangeLog  | 6 ++++++
 contrib/pdfmark/pdfmark.am | 4 +---
 doc/doc.am                 | 2 +-
 9 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 730e9d04..683d6228 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,13 @@
 
 2022-04-05  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * Makefile.am: Rename `TFLAG` macro, which means "tmac flag", to
+       `MFLAG`, because it expands to `-M` options to groff, not the
+       `-T` option, which can be bewildering.
+       * doc/doc.am (DOC_GROFF): Update expansion site.
+
+2022-03-29  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * doc/doc.am: Rename `DOC_GROFF_ONLY` to `DOC_GROFF`.
 
 2022-03-29  G. Branden Robinson <g.branden.robinson@gmail.com>
diff --git a/Makefile.am b/Makefile.am
index 30180d77..b9601568 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -596,9 +596,10 @@ endif
 GROFFBIN = $(abs_top_builddir)/groff
 GROFF_BIN_PATH = $(abs_top_builddir)
 PDFMOMBIN = $(abs_top_builddir)/pdfmom
-# The second directories are needed for the case "cd build; ../configure".
+# Search for macro files and device/font description directories in
+# source _and_ build trees; some of each are generated.
 FFLAG=-F$(abs_top_builddir)/font -F$(abs_top_srcdir)/font
-TFLAG=-M$(abs_top_builddir)/tmac -M$(abs_top_srcdir)/tmac
+MFLAG=-M$(abs_top_builddir)/tmac -M$(abs_top_srcdir)/tmac
 
 # make builtin variable RM
 if MAKE_DONT_HAVE_RM
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index 69633a70..12de4fec 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,9 @@
+2022-03-30  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * hdtbl.am: Eliminate `HDTBL_TFLAG` and `HDTBL_PFLAG` Make
+       macros; they were expanded in only one place.
+       (HDTBLGROFF): Track rename of Make macro `TFLAG` to `MFLAG`.
+
 2022-03-30  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * examples/mixed_pickles.ms: Die horribly if `PSPIC` call fails.
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 8652d49d..2c10dc6a 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -23,12 +23,10 @@ hdtbl_srcdir = $(top_srcdir)/contrib/hdtbl
 man7_MANS += contrib/hdtbl/groff_hdtbl.7
 
 # Groff command used to generate .ps files
-HDTBL_TFLAG = -M$(hdtbl_srcdir)
-HDTBL_PFLAG=-t -p -e -U
 HDTBLGROFF = \
   GROFF_COMMAND_PREFIX= \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
-  $(GROFFBIN) $(FFLAG) $(TFLAG) $(HDTBL_TFLAG) $(HDTBL_PFLAG)
+  $(GROFFBIN) $(FFLAG) $(MFLAG) -M$(hdtbl_srcdir) -t -p -e -U
 
 HDTBLTMACFILES = \
   contrib/hdtbl/hdtbl.tmac \
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index d94aab0d..f50b60f4 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,9 @@
+2021-03-29  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * mom.am: Eliminate `MOM_TFLAG` and `MOM_PFLAG` Make macros;
+       they were expanded in only one place.
+       (MOMPDFMOM): Track rename of Make macro `TFLAG` to `MFLAG`.
+
 2022-03-26  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * mom.am (MOMPROCESSEDEXAMPLEFILES): Drop dependency on gnu.eps.
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index 36dcb6db..5efc0c02 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -21,13 +21,11 @@
 mom_srcdir = $(top_srcdir)/contrib/mom
 
 # pdfmom command used to generated .pdf
-MOM_TFLAG = -M$(mom_srcdir)
-MOM_KFLAG = -k -p -e -t
 MOMPDFMOM = \
   GROFF_COMMAND_PREFIX= \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
   PDFMOM_BIN_PATH="$(top_builddir)" \
-  $(PDFMOMBIN) $(FFLAG) $(TFLAG) $(MOM_TFLAG) $(MOM_KFLAG)
+  $(PDFMOMBIN) $(FFLAG) $(MFLAG) -M$(mom_srcdir) -k -p -e -t
 
 man7_MANS += contrib/mom/groff_mom.7
 
diff --git a/contrib/pdfmark/ChangeLog b/contrib/pdfmark/ChangeLog
index e92b0960..0084a449 100644
--- a/contrib/pdfmark/ChangeLog
+++ b/contrib/pdfmark/ChangeLog
@@ -1,3 +1,9 @@
+2022-03-30  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * pdfmark.am: Eliminate `PDFMARK_TFLAG` and `PDFMARK_PFLAG` Make
+       macros; they were expanded in only one place.
+       (PDFROFF): Track rename of Make macro `TFLAG` to `MFLAG`.
+
 2022-03-30  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * cover.ms: Die horribly if `PSPIC` call fails.
diff --git a/contrib/pdfmark/pdfmark.am b/contrib/pdfmark/pdfmark.am
index 5fe6938d..8645323b 100644
--- a/contrib/pdfmark/pdfmark.am
+++ b/contrib/pdfmark/pdfmark.am
@@ -53,15 +53,13 @@ EXTRA_DIST += \
   contrib/pdfmark/pdfroff.1.man \
   contrib/pdfmark/pdfroff.sh
 
-PDFMARK_PFLAG =-dpaper=$(PAGE) -P-p$(PAGE)
-PDFMARK_TFLAG = -M$(pdfmark_srcdir)
 PDFROFF=\
   GROFF_TMPDIR=. \
   GROFF_COMMAND_PREFIX= \
   GROFF_BIN_DIR="$(GROFF_BIN_DIR)" \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
   ./pdfroff \
-  $(FFLAG) $(TFLAG) $(PDFMARK_TFLAG) $(PDFMARK_PFLAG)
+  $(FFLAG) $(MFLAG) -dpaper=$(PAGE) -P-p$(PAGE) -M$(pdfmark_srcdir)
 
 contrib/pdfmark/pdfmark.pdf: contrib/pdfmark/pdfmark.ms
        $(GROFF_V)$(MKDIR_P) `dirname $@` \
diff --git a/doc/doc.am b/doc/doc.am
index 62d0adee..5b9e3b7b 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -36,7 +36,7 @@ DOC_SED = $(SED) \
 DOC_GROFF=\
   GROFF_COMMAND_PREFIX= \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
-  $(GROFFBIN) -M $(doc_srcdir) $(TFLAG) $(FFLAG) -ww -b
+  $(GROFFBIN) -M $(doc_srcdir) $(MFLAG) $(FFLAG) -ww -b
 
 # This image file is used by several documents in the groff source tree.
 DOC_GNU_EPS=doc/gnu.eps