diff options
Diffstat (limited to '')
-rw-r--r-- | Makefile | 23 | ||||
-rw-r--r-- | Makefile.dynamic | 5 |
2 files changed, 16 insertions, 12 deletions
@@ -50,22 +50,24 @@ derived-assets = \ all: public -jekyll-deps: $(derived-assets) - $(lilypond.pdf): $(lilypond.midi) -torrents-files.txt: $(torrents-in) +torrent-files.txt: $(torrents-in) echo $(torrents-in) | tr ' ' '\n' > $@ -torrent-files.mk: torrents-files.txt - printf 'torrent-files = \\\n' > $@ - sed -e 's/^/\t/' -e 's/$$/.torrent \\/' < torrents-files.txt >> $@ +files.mk: torrent-files.txt + printf '' > $@ + printf 'torrent-files = \\\n' >> $@ + sed -e 's/^/\t/' -e 's/$$/.torrent \\/' < torrent-files.txt >> $@ printf '\n\n' >> $@ - awk '{ printf "%s.torrent: %s\n", $$1, $$1 }' torrents-files.txt >> $@ -$(torrents): torrent-files.mk +deps.mk: torrent-files.txt + printf '' > $@ + awk '{ printf "%s.torrent: %s\n", $$1, $$1 }' torrent-files.txt >> $@ + +$(torrents): files.mk deps.mk $(MAKE) -f Makefile.dynamic torrents static/favicon.png: static/favicon.svg @@ -75,6 +77,7 @@ favicon.ico: static/favicon.svg convert static/favicon.svg $@ + check: sh aux/assert-shellcheck.sh sh aux/workflow/assert-todos.sh @@ -88,9 +91,9 @@ clean: rm -rf \ public/ \ $(derived-assets) \ - torrents-files.txt torrent-files.mk + torrent-files.txt files.mk deps.mk -public: jekyll-deps +public: $(derived-assets) jekyll build publish: public diff --git a/Makefile.dynamic b/Makefile.dynamic index bbcb508..a9b0598 100644 --- a/Makefile.dynamic +++ b/Makefile.dynamic @@ -1,7 +1,8 @@ -include torrent-files.mk +include files.mk +include deps.mk torrents: $(torrent-files) # Missing -c and -w -$(torrent-files): torrent-files.mk +$(torrent-files): files.mk deps.mk mktorrent -f -v -d -n $@ -o $@ -c '' "$$(echo $@ | sed 's/\.torrent$$//')" |