[groff] 02/04: Skip the stripper, part 3/3 (mdoc). [part 3b]

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 24602f42e209e0565e778773a9d91c12eb3a921d
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Jul 4 19:54:23 2021 +1000

    Skip the stripper, part 3/3 (mdoc). [part 3b]
    
    * tmac/tmac.am (TMACNORMALFILES): Add `doc-old.tmac` and `doc.tmac`.
    
      (TMACUNSTRIPFILES, TMACSTRIPFILES): Delete variables.
    
      (dist_tmac_DATA): Drop `$(TMACUNSTRIPFILES)`.
    
      (nodist_tmac_DATA): Drop `$(TMACSTRIPFILES)`.
    
      (TMACMDOCSTRIPFILES): Rename...
      (TMACMDOCFILES): ...to this.
    
      (nodist_mdoc_DATA, MOSTLYCLEANFILES): Reflect above rename.
    
      (nodist_mdoc_DATA): Rename...
      (dist_mdoc_DATA): ...to this.
    
      (TMACMDOCUNSTRIPFILES): Delete variable.
    
      (EXTRA_DIST): Drop `$(TMACMDOCUNSTRIPFILES)`.
    
      ($(TMACSTRIPFILES), $(TMACMDOCSTRIPFILES)): Drop targets.
    
    WARNING: This commit fails two mdoc tests.
---
 ChangeLog    | 14 ++++++++++++++
 tmac/tmac.am | 31 ++++++-------------------------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3b4240f..b0e0a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,20 @@
        * tmac/mdoc/doc-nroff:
        * tmac/mdoc/doc-syms: ...to these.
 
+       * tmac/tmac.am (TMACNORMALFILES): Add `doc-old.tmac` and
+       `doc.tmac`.
+       (TMACUNSTRIPFILES, TMACSTRIPFILES): Delete variables.
+       (dist_tmac_DATA): Drop `$(TMACUNSTRIPFILES)`.
+       (nodist_tmac_DATA): Drop `$(TMACSTRIPFILES)`.
+       (TMACMDOCSTRIPFILES): Rename...
+       (TMACMDOCFILES): ...to this.
+       (nodist_mdoc_DATA, MOSTLYCLEANFILES): Reflect above rename.
+       (nodist_mdoc_DATA): Rename...
+       (dist_mdoc_DATA): ...to this.
+       (TMACMDOCUNSTRIPFILES): Delete variable.
+       (EXTRA_DIST): Drop `$(TMACMDOCUNSTRIPFILES)`.
+       ($(TMACSTRIPFILES), $(TMACMDOCSTRIPFILES)): Drop targets.
+
 2021-07-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [man pages]: Remove compatibility save register.
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 5fa798c..425a1e6 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -38,6 +38,8 @@ TMACNORMALFILES = \
   tmac/ms.tmac \
   tmac/e.tmac \
   tmac/me.tmac \
+  tmac/doc-old.tmac \
+  tmac/doc.tmac \
   tmac/mdoc.tmac \
   tmac/pic.tmac \
   tmac/a4.tmac \
@@ -97,40 +99,29 @@ TMACNORMALFILES = \
   tmac/ja.tmac \
   tmac/zh.tmac
 
-# TMACSTRIPFILES are built from their unstripped version (-u).
-TMACUNSTRIPFILES = tmac/doc.tmac-u tmac/doc-old.tmac-u
-TMACSTRIPFILES = tmac/doc.tmac tmac/doc-old.tmac
-
 # files installed in tmacdir
 #
 # "s" and "an" are not "NORMAL" because they may use compatibility
 # wrappers; see install_tmac_wrap_hook.
 dist_tmac_DATA = \
   $(TMACNORMALFILES) \
-  $(TMACUNSTRIPFILES) \
   tmac/an.tmac \
   tmac/s.tmac
-nodist_tmac_DATA = $(TMACSTRIPFILES) tmac/www.tmac
+nodist_tmac_DATA = tmac/www.tmac
 
-TMACMDOCSTRIPFILES = \
+TMACMDOCFILES = \
   tmac/mdoc/doc-common \
   tmac/mdoc/doc-ditroff \
   tmac/mdoc/doc-nroff \
   tmac/mdoc/doc-syms
-TMACMDOCUNSTRIPFILES = \
-  tmac/mdoc/doc-common-u \
-  tmac/mdoc/doc-ditroff-u \
-  tmac/mdoc/doc-nroff-u \
-  tmac/mdoc/doc-syms-u
 mdocdir=$(tmacdir)/mdoc
 # Files installed in mdocdir
-nodist_mdoc_DATA = $(TMACMDOCSTRIPFILES)
+dist_mdoc_DATA = $(TMACMDOCFILES)
 
 # Installed in localtmacdir
 dist_localtmac_DATA = tmac/man.local tmac/mdoc.local
 
-MOSTLYCLEANFILES += $(TMACMDOCSTRIPFILES) \
-   $(TMACSTRIPFILES) \
+MOSTLYCLEANFILES += $(TMACMDOCFILES) \
    tmac/groff_man.7.man \
    tmac/groff_man_style.7.man \
    tmac/www.tmac \
@@ -139,7 +130,6 @@ MOSTLYCLEANFILES += $(TMACMDOCSTRIPFILES) \
    tmac/*-wrap
 
 EXTRA_DIST += \
-  $(TMACMDOCUNSTRIPFILES) \
   tmac/fixmacros.sed \
   tmac/groff_ms.7.man \
   tmac/groff_man.7.man.in \
@@ -203,15 +193,6 @@ tmac_XFAIL_TESTS = \
   tmac/tests/an-ext_UE-punct-hyphenates.sh
 XFAIL_TESTS += $(tmac_XFAIL_TESTS)
 
-$(TMACSTRIPFILES): $(TMACUNSTRIPFILES)
-       sed -f $(tmac_srcdir)/strip.sed $(top_srcdir)/$@-u \
-           > $(top_builddir)/$@
-
-$(TMACMDOCSTRIPFILES): $(TMACMDOCUNSTRIPFILES)
-       $(MKDIR_P) $(top_builddir)/tmac/mdoc
-       sed -f $(tmac_srcdir)/strip.sed $(top_srcdir)/$@-u \
-           > $(top_builddir)/$@
-
 tmac/www.tmac: tmac/www.tmac.in
        $(MKDIR_P) $(top_builddir)/tmac
        sed -e "s;[@]PNMTOPS_NOSETPAGE[@];$(pnmtops_nosetpage);g" \