[gentoo-commits] proj/nxml-gentoo-schemas:master commit in: /

["Ulrich Müller" <ulm@gentoo.org>]

commit:     8faabd289b20cb21c739a1915ea9ed22401c5332
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 15:59:56 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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|<!ENTITY % \w\+ SYSTEM "\(.*\)\.dtd">|\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