From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2134) id 30E483858D3C; Thu, 5 May 2022 00:37:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 30E483858D3C Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jeff Johnston To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Simplify rules for creating man pages X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: 5cad308baa2edb82cdf5b46bfae369c8b6a0a846 X-Git-Newrev: 3d64a500f15a9a8984e8db7c2a714c5f5086d1d3 Message-Id: <20220505003723.30E483858D3C@sourceware.org> Date: Thu, 5 May 2022 00:37:23 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2022 00:37:23 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D3d64a500f15= a9a8984e8db7c2a714c5f5086d1d3 commit 3d64a500f15a9a8984e8db7c2a714c5f5086d1d3 Author: Jon Turney Date: Mon May 2 13:55:13 2022 +0100 Simplify rules for creating man pages =20 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. Diff: --- 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 =20 -%D%/libc.xml.stamp: %D%/libc.in.xml $(LIBC_CHAPTERS) $(LIBC_DOCBOOK_OUT_FI= LES) +%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)/r= efcontainers.xslt $< > $@.tmp - $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $(@:.stamp= =3D) - $(AM_V_at)touch $@ -%D%/libc.xml: %D%/libc.xml.stamp; @true + $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $@ =20 %C%_man: %D%/libc.xml $(AM_V_GEN)xmlto --skip-validation -o %D% --searchpath $(builddir)/%D% ma= n -m $(srcdir)/man.xsl %D%/libc.xml @@ -69,4 +67,4 @@ CLEANFILES +=3D \ %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 =20 -%D%/libm.xml.stamp: %D%/libm.in.xml $(LIBM_CHAPTERS) $(LIBM_DOCBOOK_OUT_FI= LES) +%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)/r= efcontainers.xslt $< > $@.tmp - $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $(@:.stamp= =3D) - $(AM_V_at)touch $@ -%D%/libm.xml: %D%/libm.xml.stamp; @true + $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $@ =20 %C%_man: %D%/libm.xml $(AM_V_GEN)xmlto --skip-validation -o %D% --searchpath $(builddir)/%D% ma= n -m $(srcdir)/man.xsl %D%/libm.xml @@ -88,4 +86,4 @@ CLEANFILES +=3D \ %D%/targetdep.tex.stamp \ $(LIBM_CHEWOUT_FILES) \ $(LIBM_DOCBOOK_OUT_FILES) \ - %D%/*.xml %D%/*.xml.stamp %D%/*.3 + %D%/*.xml %D%/*.3