update, now final

[ar1516.git] / Makefile

diff --git a/Makefile b/Makefile
index eeb35e7..75b586b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,25 @@
 LATEX:=pdflatex
+SHELL:=/bin/bash
 
 DOCUMENT:=ar
 PROBLEMS:=1 2 3 4
 
 SOURCES:=$(DOCUMENT).tex $(addsuffix .tex,$(PROBLEMS))
-LISTINGS:=$(addprefix src/a,$(addsuffix .bash,$(PROBLEMS)))
 SOLUTIONS:=$(addprefix a,$(addsuffix .tex,$(PROBLEMS)))
 
 .SECONDARY: $(DOCUMENT).fmt $(SOLUTIONS)
-.PHONY: solutions
 
 all: $(DOCUMENT).pdf
 
-%.pdf: %.tex %.fmt $(SOURCES) $(LISTINGS) $(SOLUTIONS)
-       $(LATEX) $(basename $<)
-       $(LATEX) $(basename $<)
+%.pdf: %.tex %.fmt $(SOURCES) $(SOLUTIONS)
+       $(LATEX) $<
+       $(LATEX) $<
 
 %.fmt: pre.tex
        $(LATEX) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
 a%.tex: src/a%.bash src src/a%.py
-       bash $< $@
+       $(SHELL) $< $@
 
 clean:
-       $(RM) -v $(addprefix $(DOCUMENT).,fmt aux log out toc pdf) $(SOLUTIONS)
+       $(RM) -v $(DOCUMENT).{fmt,aux,log,out,toc,pdf} $(SOLUTIONS)