Borrar notas.pdf en make clean-all

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

diff --git a/Makefile b/Makefile
index 4b677d530c2391601423e8d50f95f27cdb228552..cb2a467fb5524983b64009fbb88d55a565933bd7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 O := .tmp
 
 R2B := ./rst2beamer.py
 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= \
 R2BFLAGS :=  --halt=2 --lang es --codeblocks-use-pygments \
        --input-encoding=utf-8 --output-encoding=utf-8 \
        --overlaybullets= \


@@ -12,13 +12,10 @@ R2BFILTER := sed '/\\usepackage\[scaled=\.90\]{helvet}/d'
 DOT := dot
 DOTFLAGS :=
 
 DOT := dot
 DOTFLAGS :=
 

-AAFIG := aafigure
-AAFIGFLAGS := --proportional
-

 PDFLATEX := pdflatex
 PDFLATEXFLAGS := -halt-on-error -file-line-error
 
 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
 
 PROGS := bigarr conalloc concpu mcore rnddata sbtree split \
                bh bisort em3d tsp voronoi dil
 


@@ -33,7 +30,6 @@ comma := ,
 
 imgs := $O/img/mark-sweep-0.pdf \
        $(patsubst %.dot,$O/%.pdf,$(wildcard img/mark-sweep-*.dot)) \
 
 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)
        $(patsubst %,$O/img/norm-hist-%.pdf,$(PLOTS))
 
 # Verbosity flag (empty show nice messages, non-empty use make messages)


@@ -44,22 +40,34 @@ override V := $(if $V,,@)
 # honour make -s flag
 override V := $(if $(findstring s,$(MAKEFLAGS)),,$V)
 
 # honour make -s flag
 override V := $(if $(findstring s,$(MAKEFLAGS)),,$V)
 

+targets := presentacion.pdf notas.pdf
+
+.PHONY: all
+all: $(targets)
+

 presentacion.pdf: $O/presentacion.tex $(imgs)
        $(if $V,@echo "$(PDFLATEX) $< > $@")
 presentacion.pdf: $O/presentacion.tex $(imgs)
        $(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/$@ $@
+
+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/$@ $@
 
 $O/presentacion.tex: presentacion.rst $(R2B)
        $(if $V,@echo "$(R2B) $< > $@")
        $V $(R2B) $(R2BFLAGS) $< | $(R2BFILTER) > $@
 
        $V mv $O/$@ $@
 
 $O/presentacion.tex: presentacion.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/img/%.pdf: img/%.dot
        $(DOT) $(DOTFLAGS) -Tpdf -o $@ $<
 
 $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'` \
 $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 +86,12 @@ $O/img/norm-hist-%.pdf: $O/img/norm-hist-%.eps
 $O/img/%.pdf: img/%.pdf
        cp $< $@
 
 $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
 .PHONY: clean
 clean:
        $(RM) -r $O
 
 .PHONY: clean-all
 clean-all: clean

-       $(RM) presentacion.pdf
+       $(RM) $(targets)

 
 __dummy := $(shell mkdir -p $O/img)
 
 __dummy := $(shell mkdir -p $O/img)