[groff] 32/35: [refer]: Improve build modularity.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 43f7d11d91d503bca7b628825bfdc4478bc2779e
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Dec 9 04:03:59 2024 -0600

    [refer]: Improve build modularity.
    
    * tmac/tmac.am (TMACNORMALFILES): Stop shipping "refer.tmac" here...
    
    * src/preproc/refer/refer.am: ...in favor of defining appropriate
      module-specific Automake variables/make(1) macros here.
---
 ChangeLog                  | 13 +++++++++++++
 src/preproc/refer/refer.am | 11 +++++++++--
 tmac/tmac.am               |  1 -
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a903eabc..74eead9a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2024-12-09  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [refer]: Improve build modularity.
+
+       * tmac/tmac.am (TMACNORMALFILES): Stop shipping "refer.tmac"
+       here...
+       * src/preproc/refer/refer.am: ...in favor of defining
+       appropriate module-specific Automake variables/make(1) macros
+       here.
+       (uninstall_refer_hook): Attempt to remove
+       `$(DESTDIR)/$(tmacdir)` directory, ignoring failure, in case we
+       just removed the last thing in it.
+
 2024-12-09  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [pic]: Improve build modularity.
diff --git a/src/preproc/refer/refer.am b/src/preproc/refer/refer.am
index 273f33490..6a4a427c1 100644
--- a/src/preproc/refer/refer.am
+++ b/src/preproc/refer/refer.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 Free Software Foundation, Inc.
+# Copyright (C) 2014-2024 Free Software Foundation, Inc.
 #
 # This file is part of groff.
 #
@@ -29,6 +29,10 @@ refer_SOURCES =  \
   src/preproc/refer/token.h \
   src/preproc/refer/command.h
 
+REFERTMACFILES = tmac/refer.tmac
+refertmacdir = $(tmacdir)
+dist_refertmac_DATA = $(REFERTMACFILES)
+
 PREFIXMAN1 += src/preproc/refer/refer.1
 EXTRA_DIST += \
   src/preproc/refer/TODO \
@@ -41,6 +45,10 @@ src/preproc/refer/refer-refer.$(OBJEXT): defs.h
 src/preproc/refer/refer-token.$(OBJEXT): defs.h
 src/preproc/refer/refer-label.$(OBJEXT): defs.h
 
+uninstall_groffdirs: uninstall_refer_hook
+uninstall_refer_hook:
+       -rmdir $(DESTDIR)$(tmacdir)
+
 MAINTAINERCLEANFILES += \
   src/preproc/refer/label.cpp \
   src/preproc/refer/label.hpp \
@@ -53,7 +61,6 @@ EXTRA_DIST += \
   $(refer_TESTS) \
   src/preproc/refer/tests/artifacts/62124.bib
 
-
 # Local Variables:
 # fill-column: 72
 # mode: makefile-automake
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 4ba2b53fb..65065f45f 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -71,7 +71,6 @@ TMACNORMALFILES = \
   tmac/europs.tmac \
   tmac/composite.tmac \
   tmac/fallbacks.tmac \
-  tmac/refer.tmac \
   tmac/refer-me.tmac \
   tmac/refer-ms.tmac \
   tmac/troffrc \