X-Git-Url: https://git.llucax.com/z.facultad/75.00/presentacion.git/blobdiff_plain/b6b1690dc26e20bfd11b34901aa02656a5264b28..681b40c90a8081f3392ec89c381739f26ba0ca81:/Makefile

diff --git a/Makefile b/Makefile
index 4b677d5..57cd1c5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,23 +2,21 @@
 O := .tmp
 
 R2B := ./rst2beamer.py
-R2BTHEME := Darmstadt
+R2BTHEME := Frankfurt
 R2BFLAGS :=  --halt=2 --lang es --codeblocks-use-pygments \
 	--input-encoding=utf-8 --output-encoding=utf-8 \
 	--overlaybullets= \
 	--theme $(R2BTHEME)
-R2BFILTER := sed '/\\usepackage\[scaled=\.90\]{helvet}/d'
+R2BFILTER := sed '/\\usepackage\[scaled=\.90\]{helvet}/d; \
+	s/\\usepackage\[utf8\]{inputenc}/\\usepackage[utf8x]{inputenc}/'
 
 DOT := dot
 DOTFLAGS :=
 
-AAFIG := aafigure
-AAFIGFLAGS := --proportional
-
 PDFLATEX := pdflatex
 PDFLATEXFLAGS := -halt-on-error -file-line-error
 
-PLOTS := stw pause time mem ncol
+PLOTS := stw pause time mem
 PROGS := bigarr conalloc concpu mcore rnddata sbtree split \
 		bh bisort em3d tsp voronoi dil
 
@@ -33,7 +31,6 @@ comma := ,
 
 imgs := $O/img/mark-sweep-0.pdf \
 	$(patsubst %.dot,$O/%.pdf,$(wildcard img/mark-sweep-*.dot)) \
-	$O/img/heap.pdf \
 	$(patsubst %,$O/img/norm-hist-%.pdf,$(PLOTS))
 
 # Verbosity flag (empty show nice messages, non-empty use make messages)
@@ -44,22 +41,28 @@ override V := $(if $V,,@)
 # honour make -s flag
 override V := $(if $(findstring s,$(MAKEFLAGS)),,$V)
 
-presentacion.pdf: $O/presentacion.tex $(imgs)
+targets := presentacion.pdf notas.pdf
+
+.PHONY: all
+all: $(targets)
+
+%.pdf: $O/%.tex
 	$(if $V,@echo "$(PDFLATEX) $< > $@")
-	$V cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) > $@.log
-	$V cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) >> $@.log
+	$V cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) $(if $V,> $@.log)
+	$V cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) $(if $V,>> $@.log)
 	$V mv $O/$@ $@
 
-$O/presentacion.tex: presentacion.rst $(R2B)
+presentacion.pdf: $(imgs)
+
+$O/%.tex: %.rst $(R2B)
 	$(if $V,@echo "$(R2B) $< > $@")
 	$V $(R2B) $(R2BFLAGS) $< | $(R2BFILTER) > $@
 
+$O/notas.tex: R2BFLAGS += --shownotes=only
+
 $O/img/%.pdf: img/%.dot
 	$(DOT) $(DOTFLAGS) -Tpdf -o $@ $<
 
-$O/img/%.pdf: img/%.aafig
-	$(AAFIG) $(AAFIGFLAGS) -t pdf -o $@ $<
-
 $O/img/norm-hist-%.csv: img/raw-hist-%.csv
 	$(if $V,@echo "norm $< > $@")
 	$V $(AWK) -F, -v m=`cut -d, -f4 $< | $(STATS) '$$1' '%(max)s'` \
@@ -78,14 +81,12 @@ $O/img/norm-hist-%.pdf: $O/img/norm-hist-%.eps
 $O/img/%.pdf: img/%.pdf
 	cp $< $@
 
-$O/heap.pdf: AAFIGFLAGS += -s 1.4 -a 0.8
-
 .PHONY: clean
 clean:
 	$(RM) -r $O
 
 .PHONY: clean-all
 clean-all: clean
-	$(RM) presentacion.pdf
+	$(RM) $(targets)
 
 __dummy := $(shell mkdir -p $O/img)