infra

1 files changed, 10 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index da3da3c..764d229 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,14 @@
-
-pages = 64lines.txt space title.txt break
+pages = $(if $(TITLE),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
 
-.DEFAULT_GOAL = cleanview
+.DEFAULT_GOAL = view
 output_txt = $(output_name).txt
 output_pdf = $(output_name).pdf
 
@@ -48,14 +43,15 @@ done = mv -T -- $@.tmp $@
 
 .INTERMEDIATE: build/$(output_txt)
 
-build/break:
+build/break: | build
         printf \\f > $@
 
-build/space:
+build/space: | build
         printf \\n\\n\\n > $@
 
-build/$(output_txt): $(source_text_files) | build
-        $(call concatenate_with_terminator,'')
+build/$(output_txt): $(addprefix build/,$(pages)) | build
+        cat $+ > $@.tmp
+        $(done)
 
 %.pdf: %.txt
         $(LPDF) $< > $@.tmp
@@ -67,23 +63,11 @@ build/%: % | build
 clean:
         -rm -rf build
 
-.PHONY: realprint print print3 printall clean preview realview titleview cleanview
-
-cleanview: clean view$(allorthree)
-
-print: clean print$(allorthree)
-
-viewall: PAGES=1-
-viewall: realview
-printall: PAGES=1-
-printall: realprint
+.PHONY: view print viewall printall realview realprint
 
-view3: PAGES=3-
-view3: realview
-print3: PAGES=3-
-print3: realprint
+view: clean realview
+print: clean realprint
 
-preview: realview
 realview: build/$(output_pdf)
         -$(pdf_viewer) $< &
 realprint: build/$(output_pdf)