infrastructure improvements

1 files changed, 28 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 5e7b6d3..da3da3c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,15 @@
-build/title.txt: title.txt | build
-        $(call concatenate_with_terminator,\\n\\n\\n)
-build/page1.txt: way-to-be-great.txt lost-pen.txt authenticated-counterfeit.txt | build
-        $(call concatenate_with_terminator,\\n\\n\\n)
-build/rest.txt: medium.txt argument.txt break dis.txt why.txt | build
-        $(call concatenate_with_terminator,\\n\\n\\n)
 
-break:
-        printf \\\\f > $@
-
-pages = title.txt monad-tutorial.txt page1.txt introduction.txt rest.txt
+pages = 64lines.txt space title.txt break
+pages += way-to-be-great.txt space lost-pen.txt space authenticated-counterfeit.txt break
+pages += monad-tutorial.txt break
+pages += why.txt space dis.txt break
+pages += argument.txt space medium.txt break
+pages += introduction.txt break
 
 source_text_files = $(addprefix build/,$(pages))
 
+allorthree = $(if $(NOTITLE),3,all)
+
 output_name = poetrybook
 pdf_viewer = evince
 
@@ -38,7 +36,7 @@ LPDF += $(if $(NUMBER_UP),-o number-up=$(NUMBER_UP))
 LPDF += $(if $(SIDES),-o sides=$(SIDES))
 
 define concatenate_with_terminator
-@($(foreach f,$(^), cat < $(f) && [ $(f) = break ] || printf $(1);)) > $@.tmp
+@($(foreach f,$(+), cat < $(f) && printf $(1);)) > $@.tmp
         @$(done)
 endef
 
@@ -50,8 +48,14 @@ done = mv -T -- $@.tmp $@
 
 .INTERMEDIATE: build/$(output_txt)
 
+build/break:
+        printf \\f > $@
+
+build/space:
+        printf \\n\\n\\n > $@
+
 build/$(output_txt): $(source_text_files) | build
-        $(call concatenate_with_terminator,\\f)
+        $(call concatenate_with_terminator,'')
 
 %.pdf: %.txt
         $(LPDF) $< > $@.tmp
@@ -60,35 +64,31 @@ build/$(output_txt): $(source_text_files) | build
 build/%: % | build
         cp --reflink -T -- $< $@
 
-.PHONY: realprint print print3 printall clean preview realview titleview cleanview
+clean:
+        -rm -rf build
 
-cleanview: clean view3
+.PHONY: realprint print print3 printall clean preview realview titleview cleanview
 
-preview: realview
+cleanview: clean view$(allorthree)
 
-print: clean print3
+print: clean print$(allorthree)
 
-clean:
-        -rm -rf build
+viewall: PAGES=1-
+viewall: realview
+printall: PAGES=1-
+printall: realprint
 
 view3: PAGES=3-
 view3: realview
+print3: PAGES=3-
+print3: realprint
 
-titleview: PAGES=1-2
-titleview: realview
-
+preview: realview
 realview: build/$(output_pdf)
         -$(pdf_viewer) $< &
-
 realprint: build/$(output_pdf)
         $(LP) $^
 
-print3: PAGES=3-
-print3: realprint
-
-printall: PAGES=1-
-printall: realprint
-
 .PHONY: install
 install:
         apt install --no-upgrade printer-driver-cups-pdf