[PATCH 1/5] Simplify rules for creating man pages

Jon Turney <[email protected]>
Newsgroups gmane.comp.lib.newlib
Message-ID <[email protected]>
Simplify rules for creating docbook XML used to create manpages:
Updating the output using move-if-change and then unconditionally
touching the .stamp file doesn't make much sense.
---

Notes:
    See https://sourceware.org/pipermail/newlib/2022/019061.html

 newlib/libc/Makefile.inc | 8 +++-----
 newlib/libm/Makefile.inc | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/newlib/libc/Makefile.inc b/newlib/libc/Makefile.inc
index 61ae0d793..792b50f97 100644
--- a/newlib/libc/Makefile.inc
+++ b/newlib/libc/Makefile.inc
@@ -15,15 +15,13 @@ $(LIBC_CHEWOUT_FILES): $(MKDOC)
 	$(AM_V_at)touch $@
 %D%/targetdep.tex: %D%/targetdep.tex.stamp; @true
 
-%D%/libc.xml.stamp: %D%/libc.in.xml $(LIBC_CHAPTERS) $(LIBC_DOCBOOK_OUT_FILES)
+%D%/libc.xml: %D%/libc.in.xml $(LIBC_CHAPTERS) $(LIBC_DOCBOOK_OUT_FILES)
 	$(AM_V_at)\
 	for chapter in $(LIBC_CHAPTERS); do \
 	  $(TEXI2DOCBOOK) < $(srcdir)/$$chapter > %D%/`basename $${chapter%.tex}`.xml || exit 1; \
 	done
 	$(AM_V_GEN)xsltproc --xinclude --path $(builddir)/%D% --nonet $(srcdir)/refcontainers.xslt $< > [email protected]
-	$(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change [email protected] $(@:.stamp=)
-	$(AM_V_at)touch $@
-%D%/libc.xml: %D%/libc.xml.stamp; @true
+	$(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change [email protected] $@
 
 %C%_man: %D%/libc.xml
 	$(AM_V_GEN)xmlto --skip-validation -o %D% --searchpath $(builddir)/%D% man -m $(srcdir)/man.xsl %D%/libc.xml
@@ -69,4 +67,4 @@ CLEANFILES += \
 	%D%/targetdep.tex.stamp \
 	$(LIBC_CHEWOUT_FILES) \
 	$(LIBC_DOCBOOK_OUT_FILES) \
-	%D%/*.xml %D%/*.xml.stamp %D%/*.3
+	%D%/*.xml %D%/*.3
diff --git a/newlib/libm/Makefile.inc b/newlib/libm/Makefile.inc
index de63b8674..e2b6b1371 100644
--- a/newlib/libm/Makefile.inc
+++ b/newlib/libm/Makefile.inc
@@ -15,15 +15,13 @@ $(LIBM_CHEWOUT_FILES): $(MKDOC)
 	$(AM_V_at)touch $@
 %D%/targetdep.tex: %D%/targetdep.tex.stamp; @true
 
-%D%/libm.xml.stamp: %D%/libm.in.xml $(LIBM_CHAPTERS) $(LIBM_DOCBOOK_OUT_FILES)
+%D%/libm.xml: %D%/libm.in.xml $(LIBM_CHAPTERS) $(LIBM_DOCBOOK_OUT_FILES)
 	$(AM_V_at)\
 	for chapter in $(LIBM_CHAPTERS); do \
 	  $(TEXI2DOCBOOK) < $(srcdir)/$$chapter > %D%/`basename $${chapter%.tex}`.xml || exit 1; \
 	done
 	$(AM_V_GEN)xsltproc --xinclude --path $(builddir)/%D% --nonet $(srcdir)/refcontainers.xslt $< > [email protected]
-	$(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change [email protected] $(@:.stamp=)
-	$(AM_V_at)touch $@
-%D%/libm.xml: %D%/libm.xml.stamp; @true
+	$(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change [email protected] $@
 
 %C%_man: %D%/libm.xml
 	$(AM_V_GEN)xmlto --skip-validation -o %D% --searchpath $(builddir)/%D% man -m $(srcdir)/man.xsl %D%/libm.xml
@@ -88,4 +86,4 @@ CLEANFILES += \
 	%D%/targetdep.tex.stamp \
 	$(LIBM_CHEWOUT_FILES) \
 	$(LIBM_DOCBOOK_OUT_FILES) \
-	%D%/*.xml %D%/*.xml.stamp %D%/*.3
+	%D%/*.xml %D%/*.3
-- 
2.36.0
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.