From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D8800158042 for ; Fri, 1 Nov 2024 17:27:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EE3D9E0957; Fri, 1 Nov 2024 17:27:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3EE5E0957 for ; Fri, 1 Nov 2024 17:27:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE6423430B5 for ; Fri, 1 Nov 2024 17:27:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E66711DF for ; Fri, 1 Nov 2024 17:27:44 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1730479151.86cdbfd7efdb5bc5c089891ccb50533e58b62529.ulm@gentoo> Subject: [gentoo-commits] proj/devmanual:master commit in: / X-VCS-Repository: proj/devmanual X-VCS-Files: Makefile X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 86cdbfd7efdb5bc5c089891ccb50533e58b62529 X-VCS-Branch: master Date: Fri, 1 Nov 2024 17:27:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c8b7098-0dfc-4dd2-87ac-f1ca35736cd9 X-Archives-Hash: 2e990948b9e5810946ce017dbb63cd90 commit: 86cdbfd7efdb5bc5c089891ccb50533e58b62529 Author: Ulrich Müller gentoo org> AuthorDate: Fri Nov 1 16:39:11 2024 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Fri Nov 1 16:39:11 2024 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=86cdbfd7 Makefile: Remove the separate "build" target This had been added in commit aa6e1e365fff48b6e1e5470791f499a0589d39c3, so that app-doc/devmanual[offline] could call "emake build" without building documents.js. This is no longer needed; the offline condition can be tested by the Makefile itself. Drop validate as prerequisite of all because it required libxml2 as additional build dependency. Signed-off-by: Ulrich Müller gentoo.org> Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c4bb713..042ffa7 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,13 @@ DESTDIR = # Nonzero value disables external assets for offline browsing. OFFLINE = 0 -all: prereq validate build documents.js +ifeq ($(OFFLINE),0) + JS_BUILD = documents.js +else + JS_BUILD = +endif + +all: prereq $(HTMLS) $(IMAGES) $(JS_BUILD) prereq: @type rsvg-convert >/dev/null 2>&1 || \ @@ -27,15 +33,10 @@ prereq: @type xsltproc >/dev/null 2>&1 || \ { echo "dev-libs/libxslt is with python required" >&2;\ exit 1; } - @type xmllint >/dev/null 2>&1 || \ - { echo "dev-libs/libxml2 is required" >&2;\ - exit 1; } @fc-list -q "Open Sans" || \ { echo "media-fonts/open-sans is required" >&2;\ exit 1; } -build: $(HTMLS) $(IMAGES) - # We need to parse all the XMLs every time, not just the ones # that are newer than the target. This is because each search # document in devmanual gets a unique ID, which is used to @@ -78,7 +79,7 @@ appendices/todo-list/index.html: $(XMLS) .depend: $(XMLS) eclass-reference/text.xml depend.xsl devbook.xsl @xsltproc depend.xsl $(XMLS) > $@ -install: build documents.js +install: all set -e; \ for file in $(HTMLS) $(ECLASS_HTMLS) $(IMAGES); do \ install -d "$(DESTDIR)$(htmldir)"/$${file%/*}; \ @@ -133,6 +134,6 @@ distclean: clean @rm -f .depend @rm -rf eclass-reference -.PHONY: all prereq build install check validate tidy dist clean distclean +.PHONY: all prereq install check validate tidy dist clean distclean -include .depend