Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /
Date: Sat, 29 Feb 2020 16:15:37
Message-Id: 1582991996.8faabd289b20cb21c739a1915ea9ed22401c5332.ulm@gentoo
1 commit: 8faabd289b20cb21c739a1915ea9ed22401c5332
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 29 15:59:56 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 29 15:59:56 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=8faabd28
7
8 Makefile: No more automatic dependencies.
9
10 The remaining DTDs don't have any interdependencies, which much
11 simplifies things.
12
13 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
14
15 .gitignore | 2 --
16 Makefile | 27 ++++-----------------------
17 2 files changed, 4 insertions(+), 25 deletions(-)
18
19 diff --git a/.gitignore b/.gitignore
20 index 76c449f..7d15794 100644
21 --- a/.gitignore
22 +++ b/.gitignore
23 @@ -1,3 +1 @@
24 -*.dep
25 *.dtd
26 -.depend
27
28 diff --git a/Makefile b/Makefile
29 index cc4406b..304ae7e 100644
30 --- a/Makefile
31 +++ b/Makefile
32 @@ -1,7 +1,6 @@
33 DTDS = devbook.dtd glsa.dtd metadata.dtd mirrors.dtd \
34 projects.dtd repositories.dtd
35
36 -DTDDEPS = $(patsubst %.dtd,%.dep,$(DTDS))
37 RNCS = $(patsubst %.dtd,%.rnc,$(DTDS))
38
39 ifneq ($(PV),)
40 @@ -12,36 +11,20 @@ endif
41
42 TARBALL=$(PN).tar.xz
43
44 -.SUFFIXES: .dtd .rnc .dep
45 -.PHONY: depend all clean
46 +.PHONY: all clean
47 .PRECIOUS: $(RNCS) $(DTDS)
48 -.INTERMEDIATE: $(DTDDEPS)
49
50 -all: .depend $(TARBALL)
51 -
52 -depend: .depend
53 +all: $(TARBALL)
54
55 clean:
56 - rm -f *.dtd *.dep .depend
57 -
58 -.depend: $(DTDDEPS)
59 - cat *.dep > $@
60 + rm -f *.dtd
61
62 $(TARBALL): Makefile LICENCE schemas.xml $(RNCS)
63 mkdir -p $(PN)
64 cp $^ $(PN)
65 tar cJf $@ $(PN)
66
67 -.dtd.dep:
68 - echo -n > $@
69 - sed -n -e '/ENTITY/s|<!ENTITY % \w\+ SYSTEM "\(.*\)\.dtd">|\1|p' $< | \
70 - while read dep; do \
71 - echo "$(patsubst %.dtd,%.rnc,$<): $$dep.rnc $$dep.dtd" >> $@ || exit 1; \
72 - echo "$(TARBALL): $$dep.rnc" >> $@ || exit 1; \
73 - $(MAKE) "$$dep.dep" || exit 1; \
74 - done
75 -
76 -.dtd.rnc:
77 +%.rnc: %.dtd
78 trang -I dtd -O rnc $< $@
79
80 %.dtd:
81 @@ -50,5 +33,3 @@ $(TARBALL): Makefile LICENCE schemas.xml $(RNCS)
82 devbook.dtd:
83 wget -N --no-verbose \
84 https://gitweb.gentoo.org/proj/devmanual.git/plain/$@
85 -
86 --include .depend