From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from re-prd-fep-044.btinternet.com (mailomta2-re.btinternet.com [213.120.69.95]) by sourceware.org (Postfix) with ESMTPS id 58AE93858C50 for ; Mon, 2 May 2022 12:55:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 58AE93858C50 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dronecode.org.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=dronecode.org.uk Received: from re-prd-rgout-002.btmx-prd.synchronoss.net ([10.2.54.5]) by re-prd-fep-044.btinternet.com with ESMTP id <20220502125539.VHVX3224.re-prd-fep-044.btinternet.com@re-prd-rgout-002.btmx-prd.synchronoss.net>; Mon, 2 May 2022 13:55:39 +0100 Authentication-Results: btinternet.com; none X-SNCR-Rigid: 613A8DE8211819FF X-Originating-IP: [86.139.167.41] X-OWM-Source-IP: 86.139.167.41 (GB) X-OWM-Env-Sender: jonturney@btinternet.com X-VadeSecure-score: verdict=clean score=0/300, class=clean X-RazorGate-Vade: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehgdehjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemuceutffkvffkuffjvffgnffgvefqofdpqfgfvfenuceurghilhhouhhtmecufedtudenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpeflohhnucfvuhhrnhgvhicuoehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhkqeenucggtffrrghtthgvrhhnpeethefguddtudekhfduvefhtdehudegheeiffeljedtieetvdffteduueevgeeitdenucffohhmrghinhepshhouhhrtggvfigrrhgvrdhorhhgnecukfhppeekiedrudefledrudeijedrgedunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehhvghloheplhhotggrlhhhohhsthdrlhhotggrlhguohhmrghinhdpihhnvghtpeekiedrudefledrudeijedrgedupdhmrghilhhfrhhomhepjhhonhdrthhurhhnvgihsegurhhonhgvtghouggvrdhorhhgrdhukhdpnhgspghrtghpthhtohepvddprhgtphhtthhopehjohhnrdhtuhhrnhgvhiesughrohhnvggtohguvgdrohhrghdruhhkpdhrtghpthhtohepnhgvfihlihgssehsohhurhgtvgifrghrvgdrohhrgh X-RazorGate-Vade-Verdict: clean 0 X-RazorGate-Vade-Classification: clean Received: from localhost.localdomain (86.139.167.41) by re-prd-rgout-002.btmx-prd.synchronoss.net (5.8.716.04) (authenticated as jonturney@btinternet.com) id 613A8DE8211819FF; Mon, 2 May 2022 13:55:39 +0100 From: Jon Turney To: newlib@sourceware.org Cc: Jon Turney Subject: [PATCH 1/5] Simplify rules for creating man pages Date: Mon, 2 May 2022 13:55:13 +0100 Message-Id: <20220502125518.19808-2-jon.turney@dronecode.org.uk> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220502125518.19808-1-jon.turney@dronecode.org.uk> References: <20220502125518.19808-1-jon.turney@dronecode.org.uk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1199.1 required=5.0 tests=BAYES_00, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 May 2022 12:55:41 -0000 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 $< > $@.tmp - $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $(@:.stamp=) - $(AM_V_at)touch $@ -%D%/libc.xml: %D%/libc.xml.stamp; @true + $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $@ %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 $< > $@.tmp - $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $(@:.stamp=) - $(AM_V_at)touch $@ -%D%/libm.xml: %D%/libm.xml.stamp; @true + $(AM_V_at)$(SHELL) $(newlib_basedir)/../move-if-change $@.tmp $@ %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