No mencionar pools de memoria

[z.facultad/75.00/presentacion.git] / Makefile

diff --git a/Makefile b/Makefile
index cb2a467fb5524983b64009fbb88d55a565933bd7..57cd1c5cadd1e8a18563d16247a35ae7065cdf06 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,8 @@ 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 :=
@@ -45,25 +46,19 @@ targets := presentacion.pdf notas.pdf
 .PHONY: all
 all: $(targets)
 
-presentacion.pdf: $O/presentacion.tex $(imgs)
+%.pdf: $O/%.tex
        $(if $V,@echo "$(PDFLATEX) $< > $@")
        $V cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) $(if $V,> $@.log)
        $V cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) $(if $V,>> $@.log)
        $V mv $O/$@ $@
 
-notas.pdf: $O/notas.tex
-       $(if $V,@echo "$(PDFLATEX) $< > $@")
-       $V cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) $(if $V,> $@.log)
-       $V cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) $(if $V,>> $@.log)
-       $V mv $O/$@ $@
+presentacion.pdf: $(imgs)
 
-$O/presentacion.tex: presentacion.rst $(R2B)
+$O/%.tex: %.rst $(R2B)
        $(if $V,@echo "$(R2B) $< > $@")
        $V $(R2B) $(R2BFLAGS) $< | $(R2BFILTER) > $@
 
-$O/notas.tex: presentacion.rst $(R2B)
-       $(if $V,@echo "$(R2B) $< > $@")
-       $V $(R2B) $(R2BFLAGS) --shownotes=only $< | $(R2BFILTER) > $@
+$O/notas.tex: R2BFLAGS += --shownotes=only
 
 $O/img/%.pdf: img/%.dot
        $(DOT) $(DOTFLAGS) -Tpdf -o $@ $<