From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 23 Nov 2020 00:54:33 +0000 (+0000)
Subject: sort out dependencies on toml files
X-Git-Tag: otter-0.2.0~386
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1b1886b710e5feea2f093e1b2fedbe5842070740;p=otter.git

sort out dependencies on toml files

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/library/edited/files.make b/library/edited/files.make
index 7cafeed3..3094b07e 100644
--- a/library/edited/files.make
+++ b/library/edited/files.make
@@ -1,3 +1,3 @@
 LIBRARY_FILES += library/edited/chess-board.usvg
-library/edited/chess-board.usvg: library/edited/chess-board.svg library/edited/LICENCE
+library/edited/chess-board.usvg: library/edited/chess-board.svg library/edited/LICENCE library/edited.toml
 	$(LIBRARY_PROCESS_SVG)
diff --git a/library/wikimedia/files.make b/library/wikimedia/files.make
index e8b52c65..c2c7369d 100644
--- a/library/wikimedia/files.make
+++ b/library/wikimedia/files.make
@@ -1,132 +1,132 @@
 LIBRARY_FILES += library/wikimedia/chess-w-P.usvg
-library/wikimedia/chess-w-P.usvg: library/wikimedia/chess-w-P.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-P.usvg: library/wikimedia/chess-w-P.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-B.usvg
-library/wikimedia/chess-w-B.usvg: library/wikimedia/chess-w-B.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-B.usvg: library/wikimedia/chess-w-B.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-R.usvg
-library/wikimedia/chess-w-R.usvg: library/wikimedia/chess-w-R.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-R.usvg: library/wikimedia/chess-w-R.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-K.usvg
-library/wikimedia/chess-w-K.usvg: library/wikimedia/chess-w-K.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-K.usvg: library/wikimedia/chess-w-K.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-Q.usvg
-library/wikimedia/chess-w-Q.usvg: library/wikimedia/chess-w-Q.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-Q.usvg: library/wikimedia/chess-w-Q.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-P.usvg
-library/wikimedia/chess-b-P.usvg: library/wikimedia/chess-b-P.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-P.usvg: library/wikimedia/chess-b-P.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-B.usvg
-library/wikimedia/chess-b-B.usvg: library/wikimedia/chess-b-B.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-B.usvg: library/wikimedia/chess-b-B.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-R.usvg
-library/wikimedia/chess-b-R.usvg: library/wikimedia/chess-b-R.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-R.usvg: library/wikimedia/chess-b-R.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-K.usvg
-library/wikimedia/chess-b-K.usvg: library/wikimedia/chess-b-K.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-K.usvg: library/wikimedia/chess-b-K.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-Q.usvg
-library/wikimedia/chess-b-Q.usvg: library/wikimedia/chess-b-Q.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-Q.usvg: library/wikimedia/chess-b-Q.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-g-P.usvg
-library/wikimedia/chess-g-P.usvg: library/wikimedia/chess-g-P.svg library/wikimedia/LICENCE
+library/wikimedia/chess-g-P.usvg: library/wikimedia/chess-g-P.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-g-B.usvg
-library/wikimedia/chess-g-B.usvg: library/wikimedia/chess-g-B.svg library/wikimedia/LICENCE
+library/wikimedia/chess-g-B.usvg: library/wikimedia/chess-g-B.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-g-R.usvg
-library/wikimedia/chess-g-R.usvg: library/wikimedia/chess-g-R.svg library/wikimedia/LICENCE
+library/wikimedia/chess-g-R.usvg: library/wikimedia/chess-g-R.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-g-K.usvg
-library/wikimedia/chess-g-K.usvg: library/wikimedia/chess-g-K.svg library/wikimedia/LICENCE
+library/wikimedia/chess-g-K.usvg: library/wikimedia/chess-g-K.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-g-Q.usvg
-library/wikimedia/chess-g-Q.usvg: library/wikimedia/chess-g-Q.svg library/wikimedia/LICENCE
+library/wikimedia/chess-g-Q.usvg: library/wikimedia/chess-g-Q.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-r-P.usvg
-library/wikimedia/chess-r-P.usvg: library/wikimedia/chess-r-P.svg library/wikimedia/LICENCE
+library/wikimedia/chess-r-P.usvg: library/wikimedia/chess-r-P.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-r-B.usvg
-library/wikimedia/chess-r-B.usvg: library/wikimedia/chess-r-B.svg library/wikimedia/LICENCE
+library/wikimedia/chess-r-B.usvg: library/wikimedia/chess-r-B.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-r-R.usvg
-library/wikimedia/chess-r-R.usvg: library/wikimedia/chess-r-R.svg library/wikimedia/LICENCE
+library/wikimedia/chess-r-R.usvg: library/wikimedia/chess-r-R.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-r-K.usvg
-library/wikimedia/chess-r-K.usvg: library/wikimedia/chess-r-K.svg library/wikimedia/LICENCE
+library/wikimedia/chess-r-K.usvg: library/wikimedia/chess-r-K.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-r-Q.usvg
-library/wikimedia/chess-r-Q.usvg: library/wikimedia/chess-r-Q.svg library/wikimedia/LICENCE
+library/wikimedia/chess-r-Q.usvg: library/wikimedia/chess-r-Q.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-y-P.usvg
-library/wikimedia/chess-y-P.usvg: library/wikimedia/chess-y-P.svg library/wikimedia/LICENCE
+library/wikimedia/chess-y-P.usvg: library/wikimedia/chess-y-P.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-y-B.usvg
-library/wikimedia/chess-y-B.usvg: library/wikimedia/chess-y-B.svg library/wikimedia/LICENCE
+library/wikimedia/chess-y-B.usvg: library/wikimedia/chess-y-B.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-y-R.usvg
-library/wikimedia/chess-y-R.usvg: library/wikimedia/chess-y-R.svg library/wikimedia/LICENCE
+library/wikimedia/chess-y-R.usvg: library/wikimedia/chess-y-R.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-y-K.usvg
-library/wikimedia/chess-y-K.usvg: library/wikimedia/chess-y-K.svg library/wikimedia/LICENCE
+library/wikimedia/chess-y-K.usvg: library/wikimedia/chess-y-K.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-y-Q.usvg
-library/wikimedia/chess-y-Q.usvg: library/wikimedia/chess-y-Q.svg library/wikimedia/LICENCE
+library/wikimedia/chess-y-Q.usvg: library/wikimedia/chess-y-Q.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-mann.usvg
-library/wikimedia/chess-w-mann.usvg: library/wikimedia/chess-w-mann.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-mann.usvg: library/wikimedia/chess-w-mann.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-mann.usvg
-library/wikimedia/chess-b-mann.usvg: library/wikimedia/chess-b-mann.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-mann.usvg: library/wikimedia/chess-b-mann.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-elephant.usvg
-library/wikimedia/chess-w-elephant.usvg: library/wikimedia/chess-w-elephant.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-elephant.usvg: library/wikimedia/chess-w-elephant.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-elephant.usvg
-library/wikimedia/chess-b-elephant.usvg: library/wikimedia/chess-b-elephant.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-elephant.usvg: library/wikimedia/chess-b-elephant.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-g-ship.usvg
-library/wikimedia/chess-g-ship.usvg: library/wikimedia/chess-g-ship.svg library/wikimedia/LICENCE
+library/wikimedia/chess-g-ship.usvg: library/wikimedia/chess-g-ship.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-r-ship.usvg
-library/wikimedia/chess-r-ship.usvg: library/wikimedia/chess-r-ship.svg library/wikimedia/LICENCE
+library/wikimedia/chess-r-ship.usvg: library/wikimedia/chess-r-ship.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-y-ship.usvg
-library/wikimedia/chess-y-ship.usvg: library/wikimedia/chess-y-ship.svg library/wikimedia/LICENCE
+library/wikimedia/chess-y-ship.usvg: library/wikimedia/chess-y-ship.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-commoner.usvg
-library/wikimedia/chess-w-commoner.usvg: library/wikimedia/chess-w-commoner.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-commoner.usvg: library/wikimedia/chess-w-commoner.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-commoner.usvg
-library/wikimedia/chess-b-commoner.usvg: library/wikimedia/chess-b-commoner.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-commoner.usvg: library/wikimedia/chess-b-commoner.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-N.usvg
-library/wikimedia/chess-w-N.usvg: library/wikimedia/chess-w-N.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-N.usvg: library/wikimedia/chess-w-N.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-N.usvg
-library/wikimedia/chess-b-N.usvg: library/wikimedia/chess-b-N.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-N.usvg: library/wikimedia/chess-b-N.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-g-N.usvg
-library/wikimedia/chess-g-N.usvg: library/wikimedia/chess-g-N.svg library/wikimedia/LICENCE
+library/wikimedia/chess-g-N.usvg: library/wikimedia/chess-g-N.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-r-N.usvg
-library/wikimedia/chess-r-N.usvg: library/wikimedia/chess-r-N.svg library/wikimedia/LICENCE
+library/wikimedia/chess-r-N.usvg: library/wikimedia/chess-r-N.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-y-N.usvg
-library/wikimedia/chess-y-N.usvg: library/wikimedia/chess-y-N.svg library/wikimedia/LICENCE
+library/wikimedia/chess-y-N.usvg: library/wikimedia/chess-y-N.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-zebra.usvg
-library/wikimedia/chess-w-zebra.usvg: library/wikimedia/chess-w-zebra.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-zebra.usvg: library/wikimedia/chess-w-zebra.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-zebra.usvg
-library/wikimedia/chess-b-zebra.usvg: library/wikimedia/chess-b-zebra.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-zebra.usvg: library/wikimedia/chess-b-zebra.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-w-knight-king.usvg
-library/wikimedia/chess-w-knight-king.usvg: library/wikimedia/chess-w-knight-king.svg library/wikimedia/LICENCE
+library/wikimedia/chess-w-knight-king.usvg: library/wikimedia/chess-w-knight-king.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/chess-b-knight-king.usvg
-library/wikimedia/chess-b-knight-king.usvg: library/wikimedia/chess-b-knight-king.svg library/wikimedia/LICENCE
+library/wikimedia/chess-b-knight-king.usvg: library/wikimedia/chess-b-knight-king.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
 LIBRARY_FILES += library/wikimedia/mgmt-library-load-marker.usvg
-library/wikimedia/mgmt-library-load-marker.usvg: library/wikimedia/mgmt-library-load-marker.svg library/wikimedia/LICENCE
+library/wikimedia/mgmt-library-load-marker.usvg: library/wikimedia/mgmt-library-load-marker.svg library/wikimedia/LICENCE library/wikimedia.toml
 	$(LIBRARY_PROCESS_SVG)
diff --git a/media-scraper b/media-scraper
index d1abfd3f..a546080e 100755
--- a/media-scraper
+++ b/media-scraper
@@ -189,7 +189,7 @@ foreach my $groupname (sort keys %$groups) {
 
     print $makefile <<END or die $!;
 LIBRARY_FILES += $lprocessed
-$lprocessed: $lupstream $licpath
+$lprocessed: $lupstream $licpath $input
 	\$(LIBRARY_PROCESS_SVG)
 END