[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 35/35: [src/devices, tmac]: Improve build modularity.
|
From: |
G. Branden Robinson |
|
Subject: |
[groff] 35/35: [src/devices, tmac]: Improve build modularity. |
|
Date: |
Tue, 10 Dec 2024 16:35:38 -0500 (EST) |
gbranden pushed a commit to branch master
in repository groff.
commit 8910c63b6d99b2104fffd4326c8dfbe922f8b2b0
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Dec 10 10:28:10 2024 -0600
[src/devices, tmac]: Improve build modularity.
* tmac/tmac.am (TMACNORMALFILES, tmac_TESTS): Drop file names from these
macros that are better declared elsewhere.
* src/devices/grodvi/grodvi.am:
* src/devices/grohtml/grohtml.am:
* src/devices/grolbp/grolbp.am:
* src/devices/grolj4/grolj4.am:
* src/devices/gropdf/gropdf.am:
* src/devices/grops/grops.am:
* src/devices/grotty/grotty.am:
* src/devices/xditview/xditview.am: ...like here (using appropriately
particulized names). Attempt to remove `$(DESTDIR)/$(tmacdir)`
directory, ignoring failure, in case we just removed the last thing in
it.
---
ChangeLog | 19 +++++++++++++++++++
src/devices/grodvi/grodvi.am | 14 +++++++++++---
src/devices/grohtml/grohtml.am | 18 ++++++++++++++----
src/devices/grolbp/grolbp.am | 14 +++++++++++---
src/devices/grolj4/grolj4.am | 12 +++++++++++-
src/devices/gropdf/gropdf.am | 26 +++++++++++++++++++++++---
src/devices/grops/grops.am | 20 +++++++++++++++++---
src/devices/grotty/grotty.am | 17 ++++++++++++++---
src/devices/xditview/xditview.am | 11 ++++++++---
tmac/tmac.am | 19 -------------------
10 files changed, 128 insertions(+), 42 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0d617dcd8..e2abd943e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2024-12-10 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ [src/devices, tmac]: Improve build modularity.
+
+ * tmac/tmac.am (TMACNORMALFILES, tmac_TESTS): Drop file names
+ from these macros that are better declared elsewhere.
+
+ * src/devices/grodvi/grodvi.am:
+ * src/devices/grohtml/grohtml.am:
+ * src/devices/grolbp/grolbp.am:
+ * src/devices/grolj4/grolj4.am:
+ * src/devices/gropdf/gropdf.am:
+ * src/devices/grops/grops.am:
+ * src/devices/grotty/grotty.am:
+ * src/devices/xditview/xditview.am: ...like here (using
+ appropriately particulized names). Attempt to remove
+ `$(DESTDIR)/$(tmacdir)` directory, ignoring failure, in case we
+ just removed the last thing in it.
+
2024-12-10 G. Branden Robinson <g.branden.robinson@gmail.com>
* tmac/tmac.am (TMACNORMALFILES): Ship "psfig.tmac".
diff --git a/src/devices/grodvi/grodvi.am b/src/devices/grodvi/grodvi.am
index ce93359e4..fffd2fb52 100644
--- a/src/devices/grodvi/grodvi.am
+++ b/src/devices/grodvi/grodvi.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.
#
@@ -7,8 +7,8 @@
# 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.
#
@@ -21,9 +21,17 @@ grodvi_LDADD = \
libdriver.a \
libgroff.a \
lib/libgnu.a $(LIBM)
+
+GRODVITMACFILES = tmac/dvi.tmac
+grodvitmacdir = $(tmacdir)
+dist_grodvitmac_DATA = $(GRODVITMACFILES)
+
man1_MANS += src/devices/grodvi/grodvi.1
EXTRA_DIST += src/devices/grodvi/grodvi.1.man
+uninstall_groffdirs: uninstall_grodvi_hook
+uninstall_grodvi_hook:
+ -rmdir $(DESTDIR)$(tmacdir)
# Local Variables:
# fill-column: 72
diff --git a/src/devices/grohtml/grohtml.am b/src/devices/grohtml/grohtml.am
index a87cad2e3..13d2b9643 100644
--- a/src/devices/grohtml/grohtml.am
+++ b/src/devices/grohtml/grohtml.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.
#
@@ -7,8 +7,8 @@
# 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.
#
@@ -28,10 +28,20 @@ post_grohtml_SOURCES = \
post_grohtml_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
- lib/libgnu.a
+ lib/libgnu.a
+
+POSTGROHTMLTMACFILES = \
+ tmac/html.tmac \
+ tmac/html-end.tmac
+post_grohtmltmacdir = $(tmacdir)
+dist_post_grohtmltmac_DATA = $(POSTGROHTMLTMACFILES)
+
man1_MANS += src/devices/grohtml/grohtml.1
EXTRA_DIST += src/devices/grohtml/grohtml.1.man
+uninstall_groffdirs: uninstall_post_grohtml_hook
+uninstall_post_grohtml_hook:
+ -rmdir $(DESTDIR)$(tmacdir)
# Local Variables:
# fill-column: 72
diff --git a/src/devices/grolbp/grolbp.am b/src/devices/grolbp/grolbp.am
index 3ee3a0a54..8d7c45285 100644
--- a/src/devices/grolbp/grolbp.am
+++ b/src/devices/grolbp/grolbp.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.
#
@@ -7,8 +7,8 @@
# 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.
#
@@ -25,9 +25,17 @@ grolbp_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
lib/libgnu.a
+
+GROLBPTMACFILES = tmac/lbp.tmac
+grolbptmacdir = $(tmacdir)
+dist_grolbptmac_DATA = $(GROLBPTMACFILES)
+
man1_MANS += src/devices/grolbp/grolbp.1
EXTRA_DIST += src/devices/grolbp/grolbp.1.man
+uninstall_groffdirs: uninstall_grolbp_hook
+uninstall_grolbp_hook:
+ -rmdir $(DESTDIR)$(tmacdir)
# Local Variables:
# fill-column: 72
diff --git a/src/devices/grolj4/grolj4.am b/src/devices/grolj4/grolj4.am
index 37138b222..aed224322 100644
--- a/src/devices/grolj4/grolj4.am
+++ b/src/devices/grolj4/grolj4.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.
#
@@ -17,14 +17,24 @@
bin_PROGRAMS += grolj4
grolj4_SOURCES = src/devices/grolj4/lj4.cpp
+
grolj4_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
lib/libgnu.a
+
+GROLJ4TMACFILES = tmac/lj4.tmac
+grolj4tmacdir = $(tmacdir)
+dist_grolj4tmac_DATA = $(GROLJ4TMACFILES)
+
man1_MANS += src/devices/grolj4/grolj4.1
EXTRA_DIST += \
src/devices/grolj4/grolj4.1.man
+uninstall_groffdirs: uninstall_grolj4_hook
+uninstall_grolj4_hook:
+ -rmdir $(DESTDIR)$(tmacdir)
+
# Local Variables:
# fill-column: 72
# mode: makefile-automake
diff --git a/src/devices/gropdf/gropdf.am b/src/devices/gropdf/gropdf.am
index 3dbd8658a..5327f1b32 100644
--- a/src/devices/gropdf/gropdf.am
+++ b/src/devices/gropdf/gropdf.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2024 Free Software Foundation, Inc.
# Written by Deri James <deri@chuzzlewit.myzen.co.uk>
# Automake migration by Bertrand Garrigues
#
@@ -9,8 +9,8 @@
# 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.
#
@@ -27,6 +27,12 @@ EXTRA_DIST += \
src/devices/gropdf/gropdf.1.man \
src/devices/gropdf/pdfmom.1.man
+GROPDFTMACFILES = \
+ tmac/pdf.tmac \
+ tmac/pdfpic.tmac
+gropdftmacdir = $(tmacdir)
+dist_gropdftmac_DATA = $(GROPDFTMACFILES)
+
man1_MANS += \
src/devices/gropdf/gropdf.1 \
src/devices/gropdf/pdfmom.1
@@ -50,6 +56,20 @@ pdfmom: $(gropdf_dir)/pdfmom.pl $(SH_DEPS_SED_SCRIPT)
>$@ \
&& chmod +x $@
+gropdf_TESTS = \
+ tmac/tests/pdf_bookmark-starting-with-control-char-works.sh \
+ tmac/tests/pdfpic_does-not-choke-on-bad-pdfinfo-output.sh \
+ tmac/tests/pdfpic_falls-back-to-PSPIC.sh
+TESTS += $(gropdf_TESTS)
+EXTRA_DIST += $(gropdf_TESTS)
+
+gropdf_XFAIL_TESTS = \
+ tmac/tests/pdf_bookmark-starting-with-control-char-works.sh
+XFAIL_TESTS += $(gropdf_XFAIL_TESTS)
+
+uninstall_groffdirs: uninstall_gropdf_hook
+uninstall_gropdf_hook:
+ -rmdir $(DESTDIR)$(tmacdir)
# Local Variables:
# fill-column: 72
diff --git a/src/devices/grops/grops.am b/src/devices/grops/grops.am
index cb5532a3a..e1d2fcb9a 100644
--- a/src/devices/grops/grops.am
+++ b/src/devices/grops/grops.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.
#
@@ -7,8 +7,8 @@
# 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.
#
@@ -24,12 +24,26 @@ grops_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
lib/libgnu.a
+
+GROPSTMACFILES = \
+ tmac/europs.tmac \
+ tmac/ps.tmac \
+ tmac/psatk.tmac \
+ tmac/psfig.tmac \
+ tmac/psold.tmac \
+ tmac/pspic.tmac
+gropstmacdir = $(tmacdir)
+dist_gropstmac_DATA = $(GROPSTMACFILES)
+
man1_MANS += src/devices/grops/grops.1
EXTRA_DIST += \
src/devices/grops/grops.1.man \
src/devices/grops/psfig.diff \
src/devices/grops/TODO
+uninstall_groffdirs: uninstall_grops_hook
+uninstall_grops_hook:
+ -rmdir $(DESTDIR)$(tmacdir)
# Local Variables:
# fill-column: 72
diff --git a/src/devices/grotty/grotty.am b/src/devices/grotty/grotty.am
index 14921c562..67d241ea9 100644
--- a/src/devices/grotty/grotty.am
+++ b/src/devices/grotty/grotty.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2021 Free Software Foundation, Inc.
+# Copyright (C) 2014-2024 Free Software Foundation, Inc.
#
# This file is part of groff.
#
@@ -7,8 +7,8 @@
# 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.
#
@@ -21,6 +21,13 @@ grotty_LDADD = $(LIBM) \
libdriver.a \
libgroff.a \
lib/libgnu.a
+
+GROTTYTMACFILES = \
+ tmac/tty.tmac \
+ tmac/tty-char.tmac
+grottytmacdir = $(tmacdir)
+dist_grottytmac_DATA = $(GROTTYTMACFILES)
+
man1_MANS += src/devices/grotty/grotty.1
EXTRA_DIST += \
src/devices/grotty/grotty.1.man \
@@ -32,6 +39,10 @@ grotty_TESTS = \
TESTS += $(grotty_TESTS)
EXTRA_DIST += $(grotty_TESTS)
+uninstall_groffdirs: uninstall_grotty_hook
+uninstall_grotty_hook:
+ -rmdir $(DESTDIR)$(tmacdir)
+
# Local Variables:
# fill-column: 72
# mode: makefile-automake
diff --git a/src/devices/xditview/xditview.am b/src/devices/xditview/xditview.am
index e0a2c3e43..cb0a2db6a 100644
--- a/src/devices/xditview/xditview.am
+++ b/src/devices/xditview/xditview.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.
#
@@ -59,6 +59,12 @@ gxditview_SOURCES = $(GXDITVIEWSOURCES)
nodist_gxditview_SOURCES = $(XDITVIEW_GENHDRS)
CLEANFILES += $(XDITVIEW_GENHDRS)
+GXDITVIEWTMACFILES = \
+ tmac/tty.tmac \
+ tmac/tty-char.tmac
+gxditviewtmacdir = $(tmacdir)
+dist_gxditviewtmac_DATA = $(GXDITVIEWTMACFILES)
+
man1_MANS += $(GXDITVIEW_MAN1)
# Because we defined gxditview_CPPFLAGS, automake renames all of
@@ -119,10 +125,9 @@ uninstall_xditview:
$(RM) $(DESTDIR)$(appdefdir)/GXditview-color
$(RM) $(DESTDIR)$(fontdir)/FontMap-X11
-rmdir $(DESTDIR)$(fontdir) 2>/dev/null
-
+ -rmdir $(DESTDIR)$(tmacdir) 2>/dev/null
endif
-
# Local Variables:
# fill-column: 72
# mode: makefile-automake
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 2bb1089b7..92f052caf 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -46,17 +46,7 @@ TMACNORMALFILES = \
tmac/62bit.tmac \
tmac/ec.tmac \
tmac/trace.tmac \
- tmac/ps.tmac \
- tmac/psatk.tmac \
- tmac/psfig.tmac \
- tmac/psold.tmac \
- tmac/pspic.tmac \
tmac/ptx.tmac \
- tmac/pdf.tmac \
- tmac/pdfpic.tmac \
- tmac/dvi.tmac \
- tmac/tty.tmac \
- tmac/tty-char.tmac \
tmac/latin1.tmac \
tmac/latin2.tmac \
tmac/latin5.tmac \
@@ -64,12 +54,7 @@ TMACNORMALFILES = \
tmac/koi8-r.tmac \
tmac/X.tmac \
tmac/Xps.tmac \
- tmac/lj4.tmac \
- tmac/lbp.tmac \
- tmac/html.tmac \
- tmac/html-end.tmac \
tmac/devtag.tmac \
- tmac/europs.tmac \
tmac/composite.tmac \
tmac/fallbacks.tmac \
tmac/refer-me.tmac \
@@ -140,7 +125,6 @@ EXTRA_DIST += \
tmac/hyphenex.pl \
tmac/LOCALIZATION \
tmac/man.ultrix \
- tmac/psfig.tmac \
tmac/ptx.tmac \
tmac/TESTING-HINTS \
tmac/TODO \
@@ -230,9 +214,6 @@ tmac_TESTS = \
tmac/tests/latin5_works.sh \
tmac/tests/latin9_works.sh \
tmac/tests/localization-works.sh \
- tmac/tests/pdf_bookmark-starting-with-control-char-works.sh \
- tmac/tests/pdfpic_does-not-choke-on-bad-pdfinfo-output.sh \
- tmac/tests/pdfpic_falls-back-to-PSPIC.sh \
tmac/tests/s_EQ-handles-empty-first-arg.sh \
tmac/tests/s_IP-indents-using-paragraph-type-size.sh \
tmac/tests/s_IP-respects-inter-sentence-space-in-tags.sh \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 35/35: [src/devices, tmac]: Improve build modularity.,
G. Branden Robinson <=