overflow-tube: Add cover up instruction (introduce var)

[quacks.git] / Makefile

diff --git a/Makefile b/Makefile
index 193c3768452e61b7d7a769f733ec19f4617a5731..0df6e5d64ef6c3d3c55f62fd2a8b3502da510a60 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 # Copyright 2020-2021 Ian Jackson
 
 PUBLISH_MD += pumpkin-books house-rules
-PUBLISH += pumpkin-books.pdf README.html
+PUBLISH += pumpkin-books.pdf overflow-tube.pdf index.html
 PUBLISH += LICENCE.txt GPL-3.txt CC-BY-SA-4.0.txt
 PUBLISH += $(addsuffix .md.txt,  $(PUBLISH_MD))
 PUBLISH += $(addsuffix .md.html, $(PUBLISH_MD))
@@ -21,20 +21,22 @@ BOOKS+=             black-pair/black-more
 
 BOOK_STEMS := $(addprefix book-,$(subst /, ,$(BOOKS)))
 PUBLISH += $(addsuffix .pdf, $(BOOK_STEMS))
+PUBLISH += $(addsuffix .png, $(BOOK_STEMS))
 
 all:   $(PUBLISH)
 
 # Don't print the ps, printers (eg ours!) don't always have the fonts
 
-o=>$@.new && mv -f $@.new $@
+i=mv -f $@.new $@
+o=>$@.new && $i
 use_rsvg=rsvg-convert -f png -o $@.tmp.png $<
 shell_pipe=set -o pipefail; set -e;
 make_pnm = pnmdepth 255 | pnmnoraw $o
 
-pumpkin-books.ps: pumpkin-books.ps.pl bag.pgm pot.pgm droplet.ppm
+%.ps: %.ps.pl bag.pgm pot.pgm droplet.ppm
        ./$< $(BOOKS) $o
 
-pumpkin-books.pdf: pumpkin-books.ps
+%.pdf: %.ps
        gs -q -dNOPAUSE -dBATCH -dPDFSETTINGS=/prepress \
                -sDEVICE=pdfwrite -sOutputFile=$@ $<
 
@@ -60,11 +62,17 @@ droplet.ppm: droplet.svg Makefile
        | pnmdepth 255                                  \
        | $(make_pnm)
 
+$(addsuffix .ps, $(BOOK_STEMS)): pumpkin-books.ps
+       @:
+
 book-%.pdf: book-%.eps
-       rm -f $@; ps2pdf $<
+       rm -f $@.new; ps2pdf $< $@.new && $i
 
 book-%.eps: book-%.ps
-       rm -f $@; ps2eps $<
+       ps2eps <$< $o
+
+book-%.png: book-%.eps Makefile
+       gm convert -density 100x100 $< $@
 
 .PRECIOUS: book-%.eps
 
@@ -72,6 +80,9 @@ PUBLISH_FILES= \
        $(patsubst %.md,%.md.txt, $(PUBLISH)) \
        $(patsubst %.md,%.md.html, $(filter $(PUBLISH)) \
 
+index.html: gen-index README.html
+       ./$^ $(BOOK_STEMS) $o
+
 %.md.txt: %.md
        cat $< $o