[groff] 09/09: Skip the stripper, part 2 ("hdtbl").

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit f2f52b9afffb236a26e1d848192c2f2145cc4f56
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Jul 1 22:23:46 2021 +1000

    Skip the stripper, part 2 ("hdtbl").
    
    * contrib/hdtbl/hdmisc.tmac-u: Rename to...
    * contrib/hdtbl/hdmisc.tmac: ...this.
    
    * contrib/hdtbl/hdtbl.tmac-u: Rename to...
    * contrib/hdtbl/hdtbl.tmac: ...this.
    
    * contrib/hdtbl/hdtbl.am (HDSTRIPFILES): Rename to...
      (HDTBLTMACFILES): ...this.
      (hdtbltmac_DATA): Rename to...
      (dist_hdtbltmac_DATA): ...this.
      (MOSTLYCLEANFILES): Drop $(HDTBLSTRIPFILES).
      ($(HDTBLSTRIPFILES)): Drop target.
---
 contrib/hdtbl/ChangeLog                      | 17 ++++++++++++++++
 contrib/hdtbl/{hdmisc.tmac-u => hdmisc.tmac} |  0
 contrib/hdtbl/hdtbl.am                       | 30 ++++++++++------------------
 contrib/hdtbl/{hdtbl.tmac-u => hdtbl.tmac}   |  0
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index b1bc833..f573f34 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,20 @@
+2021-07-01  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       Skip the stripper, part 2 ("hdtbl").
+
+       * contrib/hdtbl/hdmisc.tmac-u: Rename to...
+       * contrib/hdtbl/hdmisc.tmac: ...this.
+
+       * contrib/hdtbl/hdtbl.tmac-u: Rename to...
+       * contrib/hdtbl/hdtbl.tmac: ...this.
+
+       * contrib/hdtbl/hdtbl.am (HDSTRIPFILES): Rename to...
+       (HDTBLTMACFILES): ...this.
+       (hdtbltmac_DATA): Rename to...
+       (dist_hdtbltmac_DATA): ...this.
+       (MOSTLYCLEANFILES): Drop $(HDTBLSTRIPFILES).
+       ($(HDTBLSTRIPFILES)): Drop target.
+
 2018-12-26  Ingo Schwarze  <schwarze@openbsd.org>
 
        A missing prerequisite could cause parallel builds to fail.
diff --git a/contrib/hdtbl/hdmisc.tmac-u b/contrib/hdtbl/hdmisc.tmac
similarity index 100%
rename from contrib/hdtbl/hdmisc.tmac-u
rename to contrib/hdtbl/hdmisc.tmac
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index c6440c5..1a68433 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -7,11 +7,11 @@
 #
 # 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.
+# 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 WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# 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.
 #
@@ -31,14 +31,11 @@ HDTBLGROFF = \
   GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
   $(GROFFBIN) $(FFLAG) $(TFLAG) $(HDTBL_TFLAG) $(HDTBL_PFLAG)
 
-# Files installed in $(tmacdir).
-# These files are generated with 'strip.sed' from their unstripped source file
-# equivalent (e.g. hdtbl.tmac is generated from hdtbl.tmac-u)
-HDTBLSTRIPFILES = \
+HDTBLTMACFILES = \
   contrib/hdtbl/hdtbl.tmac \
   contrib/hdtbl/hdmisc.tmac
 hdtbltmacdir = $(tmacdir)
-hdtbltmac_DATA = $(HDTBLSTRIPFILES)
+dist_hdtbltmac_DATA = $(HDTBLTMACFILES)
 
 # Files installed in $(exampledir)/hdtbl.  HDTBLEXAMPLEFILES are
 # located in the source tree, while HDTBLPROCESSEDEXAMPLEFILES are
@@ -87,19 +84,16 @@ nodist_hdtblexample_DATA = \
   $(HDTBLPROCESSEDEXAMPLEFILES) \
   gnu.eps
 else
-EXTRA_DIST += $(HDTBLEXAMPLEFILES) 
+EXTRA_DIST += $(HDTBLEXAMPLEFILES)
 endif
-$(hdtblexample_DATA): $(HDTBLSTRIPFILES)
+$(hdtblexample_DATA): $(HDTBLTMACFILES)
 
-MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES) \
-  $(HDTBLSTRIPFILES)
+MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES)
 
 EXTRA_DIST += \
   contrib/hdtbl/ChangeLog \
   contrib/hdtbl/TODO \
-  contrib/hdtbl/groff_hdtbl.7.man \
-  contrib/hdtbl/hdtbl.tmac-u \
-  contrib/hdtbl/hdmisc.tmac-u
+  contrib/hdtbl/groff_hdtbl.7.man
 
 if BUILD_EXAMPLES
 hdtbl_TESTS = contrib/hdtbl/examples/test-hdtbl.sh
@@ -131,10 +125,6 @@ SUFFIXES += .roff .in .ps
 $(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff eqn pic tbl \
   contrib/hdtbl/examples/common.roff
 
-$(HDTBLSTRIPFILES): $(top_srcdir)/tmac/strip.sed
-       @$(MKDIR_P) `dirname $@`
-       sed -f $(top_srcdir)/tmac/strip.sed $(hdtbl_srcdir)/`basename $@`-u > 
$@;
-
 uninstall_groffdirs: uninstall-hdtbl-hook
 uninstall-hdtbl-hook:
        if test -d $(DESTDIR)$(hdtblexampledir); then \
diff --git a/contrib/hdtbl/hdtbl.tmac-u b/contrib/hdtbl/hdtbl.tmac
similarity index 100%
rename from contrib/hdtbl/hdtbl.tmac-u
rename to contrib/hdtbl/hdtbl.tmac