gbranden pushed a commit to branch master
in repository groff.
commit ee62e14527f4d6353a31fd179ae0f587ba0fab83
Author: G. Branden Robinson <g.branden.robin...@gmail.com>
AuthorDate: Mon Dec 9 03:44:10 2024 -0600
[pic]: Improve build modularity.
* tmac/tmac.am (TMACNORMALFILES): Stop shipping "pic.tmac" here...
* src/preproc/pic/pic.am: ...in favor of defining appropriate
module-specific Automake variables/make(1) macros here.
(uninstall_pic_hook): Attempt to remove `$(DESTDIR)/$(tmacdir)`
directory, ignoring failure, in case we just removed the last thing in
it.
---
ChangeLog | 12 ++++++++++++
src/preproc/pic/pic.am | 15 +++++++++++----
tmac/tmac.am | 1 -
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bcc3862e9..4a903eabc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-09 G. Branden Robinson <g.branden.robin...@gmail.com>
+
+ [pic]: Improve build modularity.
+
+ * tmac/tmac.am (TMACNORMALFILES): Stop shipping "pic.tmac"
+ here...
+ * src/preproc/pic/pic.am: ...in favor of defining appropriate
+ module-specific Automake variables/make(1) macros here.
+ (uninstall_pic_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.robin...@gmail.com>
[eqn]: Improve build modularity.
diff --git a/src/preproc/pic/pic.am b/src/preproc/pic/pic.am
index fae13720b..78b16715b 100644
--- a/src/preproc/pic/pic.am
+++ b/src/preproc/pic/pic.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.
#
@@ -35,6 +35,10 @@ pic_SOURCES = \
src/preproc/pic/output.h \
src/preproc/pic/object.h
+PICTMACFILES = tmac/pic.tmac
+pictmacdir = $(tmacdir)
+dist_pictmac_DATA = $(PICTMACFILES)
+
PREFIXMAN1 += src/preproc/pic/pic.1
EXTRA_DIST += \
src/preproc/pic/TODO \
@@ -43,12 +47,15 @@ EXTRA_DIST += \
# Since pic_CPPFLAGS was set, all .o files have a 'pic-' prefix.
src/preproc/pic/pic-lex.$(OBJEXT): src/preproc/pic/pic.hpp
+uninstall_groffdirs: uninstall_pic_hook
+uninstall_pic_hook:
+ -rmdir $(DESTDIR)$(tmacdir)
+
MAINTAINERCLEANFILES += \
src/preproc/pic/pic.cpp \
src/preproc/pic/pic.hpp \
src/preproc/pic/pic.output
-
# Local Variables:
# fill-column: 72
# mode: makefile-automake
diff --git a/tmac/tmac.am b/tmac/tmac.am
index b1edee837..4ba2b53fb 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -42,7 +42,6 @@ TMACNORMALFILES = \
tmac/doc-old.tmac \
tmac/doc.tmac \
tmac/mdoc.tmac \
- tmac/pic.tmac \
tmac/papersize.tmac \
tmac/62bit.tmac \
tmac/ec.tmac \
_______________________________________________
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit
