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 25901138351 for ; Sat, 29 Feb 2020 16:15:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C389E095D; Sat, 29 Feb 2020 16:15:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 260C0E095D for ; Sat, 29 Feb 2020 16:15:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D4D6C34F0D8 for ; Sat, 29 Feb 2020 16:15:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2DCC17A for ; Sat, 29 Feb 2020 16:15:32 +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: <1582991996.8faabd289b20cb21c739a1915ea9ed22401c5332.ulm@gentoo> Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: / X-VCS-Repository: proj/nxml-gentoo-schemas X-VCS-Files: .gitignore Makefile X-VCS-Directories: / X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 8faabd289b20cb21c739a1915ea9ed22401c5332 X-VCS-Branch: master Date: Sat, 29 Feb 2020 16:15:32 +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: d138d0be-4cf6-4a48-bf6d-5e7d29cfc7ac X-Archives-Hash: b903f299d237b5e76f42fb50d00f389a commit: 8faabd289b20cb21c739a1915ea9ed22401c5332 Author: Ulrich Müller gentoo org> AuthorDate: Sat Feb 29 15:59:56 2020 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Feb 29 15:59:56 2020 +0000 URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=8faabd28 Makefile: No more automatic dependencies. The remaining DTDs don't have any interdependencies, which much simplifies things. Signed-off-by: Ulrich Müller gentoo.org> .gitignore | 2 -- Makefile | 27 ++++----------------------- 2 files changed, 4 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 76c449f..7d15794 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -*.dep *.dtd -.depend diff --git a/Makefile b/Makefile index cc4406b..304ae7e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ DTDS = devbook.dtd glsa.dtd metadata.dtd mirrors.dtd \ projects.dtd repositories.dtd -DTDDEPS = $(patsubst %.dtd,%.dep,$(DTDS)) RNCS = $(patsubst %.dtd,%.rnc,$(DTDS)) ifneq ($(PV),) @@ -12,36 +11,20 @@ endif TARBALL=$(PN).tar.xz -.SUFFIXES: .dtd .rnc .dep -.PHONY: depend all clean +.PHONY: all clean .PRECIOUS: $(RNCS) $(DTDS) -.INTERMEDIATE: $(DTDDEPS) -all: .depend $(TARBALL) - -depend: .depend +all: $(TARBALL) clean: - rm -f *.dtd *.dep .depend - -.depend: $(DTDDEPS) - cat *.dep > $@ + rm -f *.dtd $(TARBALL): Makefile LICENCE schemas.xml $(RNCS) mkdir -p $(PN) cp $^ $(PN) tar cJf $@ $(PN) -.dtd.dep: - echo -n > $@ - sed -n -e '/ENTITY/s||\1|p' $< | \ - while read dep; do \ - echo "$(patsubst %.dtd,%.rnc,$<): $$dep.rnc $$dep.dtd" >> $@ || exit 1; \ - echo "$(TARBALL): $$dep.rnc" >> $@ || exit 1; \ - $(MAKE) "$$dep.dep" || exit 1; \ - done - -.dtd.rnc: +%.rnc: %.dtd trang -I dtd -O rnc $< $@ %.dtd: @@ -50,5 +33,3 @@ $(TARBALL): Makefile LICENCE schemas.xml $(RNCS) devbook.dtd: wget -N --no-verbose \ https://gitweb.gentoo.org/proj/devmanual.git/plain/$@ - --include .depend