update, now final

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)

diff --git a/README.md b/README.md
index 920fe51..ca09431 100644 (file)
--- a/README.md
+++ b/README.md
@@ -6,7 +6,6 @@ Automated Reasoning 2015
        - hyperref
        - a4wide
        - float
-       - graphicx
        - amsmath
        - listings
        - nicefrac
@@ -14,6 +13,7 @@ Automated Reasoning 2015
 - Yices
 - Bash
 - Python3
+- Make
 
 ###Licence
 

diff --git a/pre.tex b/pre.tex
index 5d2db97..3c32ff0 100644 (file)
--- a/pre.tex
+++ b/pre.tex
@@ -3,7 +3,6 @@
 \usepackage{hyperref}  % For clickable links
 \usepackage{a4wide}    % For better page usage
 \usepackage{float}     % For better placement of tables/figures
-\usepackage{graphicx}  % For images
 \usepackage{amsmath}   % For align
 \usepackage{listings}  % For code snippets
 \usepackage{nicefrac}  % For diagonal fractions