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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58E85138350 for ; Tue, 11 Feb 2020 11:30:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A35B6E094A; Tue, 11 Feb 2020 11:30:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7D8BEE094A for ; Tue, 11 Feb 2020 11:30:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0169D34EB53 for ; Tue, 11 Feb 2020 11:30:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CFCB10C for ; Tue, 11 Feb 2020 11:30:47 +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: <1581420412.37415c314cd0bbbc07f7f43b3364abed2cb641d3.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: 37415c314cd0bbbc07f7f43b3364abed2cb641d3 X-VCS-Branch: master Date: Tue, 11 Feb 2020 11:30:47 +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: 0fe928c0-aa47-43c2-a823-1e9fda8b5b87 X-Archives-Hash: cfe20049a711d1da5dbde54cb5412a83 commit: 37415c314cd0bbbc07f7f43b3364abed2cb641d3 Author: Ulrich Müller gentoo org> AuthorDate: Tue Feb 11 11:26:52 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Feb 11 11:26:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=37415c31 Makefile: Remove quirks necessary for installing in-place. Now that infra installs into a separate target directory, we no longer need atomicity during the build. Remove the delete-old rule as well, which was intended for the same purpose. Signed-off-by: Ulrich Müller gentoo.org> Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d8e3547..b93a85e 100644 --- a/Makefile +++ b/Makefile @@ -41,8 +41,7 @@ build: $(HTMLS) $(IMAGES) # document in devmanual gets a unique ID, which is used to # quickly tie search matches to the corresponding documents. documents.js: bin/build_search_documents.py $(XMLS) - ./bin/build_search_documents.py $(XMLS) > _documents.js - mv _documents.js documents.js + ./bin/build_search_documents.py $(XMLS) > $@ %.png : %.svg rsvg-convert --output=$@ $< @@ -89,14 +88,7 @@ tidy: $(HTMLS) $(ECLASS_HTMLS) test $${status} -eq 0 && echo "tidy validation successful"; \ exit $${status} -# Delete any orphaned html and image files that could be left over -# after the corresponding source file was moved or removed. -delete-old: - @-rm -f $(filter-out $(HTMLS) $(ECLASS_HTMLS) $(IMAGES), \ - $(filter %/index.html %.png,$(ALL_FILES))) - @find . ! -path './.git*' -type d -empty -delete - clean: - @rm -f $(HTMLS) $(IMAGES) _documents.js documents.js + @rm -f $(HTMLS) $(IMAGES) documents.js -.PHONY: all prereq build install validate tidy delete-old clean +.PHONY: all prereq build install validate tidy clean