Eliminar notas de rst2beamer

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

diff --git a/Makefile b/Makefile
index 1b342715a4e90d6d206fb775608f59d9ca00daf4..07fdfbf133803040c399d7155398e3fdaa98051b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,29 +2,29 @@
 O := .tmp
 
 R2B := ./rst2beamer.py
 O := .tmp
 
 R2B := ./rst2beamer.py

-R2BTHEME := Darmstadt
+R2BTHEME := Luca

 R2BFLAGS :=  --halt=2 --lang es --codeblocks-use-pygments \
        --input-encoding=utf-8 --output-encoding=utf-8 \
        --overlaybullets= \
        --theme $(R2BTHEME)
 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}/; \
+       s/\\institute{\(.*\)}/\\institute[FIUBA]{\1}/'

 
 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
 
 STATS := ./stats.py
 TEMPLITE := ./templite.py
 
 PROGS := bigarr conalloc concpu mcore rnddata sbtree split \
                bh bisort em3d tsp voronoi dil
 
 STATS := ./stats.py
 TEMPLITE := ./templite.py
 

+AWK := awk

 EPSTOPDF := epstopdf
 GNUPLOT := gnuplot
 
 EPSTOPDF := epstopdf
 GNUPLOT := gnuplot
 


@@ -32,49 +32,56 @@ 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))
 
        $(patsubst %,$O/img/norm-hist-%.pdf,$(PLOTS))
 

-presentacion.pdf: $O/presentacion.tex $(imgs)
-       @echo "$(PDFLATEX) $< > $@"
-       @cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) > $@.log
-       @cd $O && $(PDFLATEX) $(PDFLATEXFLAGS) $(<F) >> $@.log
-       @mv $O/$@ $@
+# Verbosity flag (empty show nice messages, non-empty use make messages)
+# When used internal, $V expand to @ is nice messages should be printed, this
+# way it's easy to add $V in front of commands that should be silenced when
+# displaying the nice messages.
+override V := $(if $V,,@)
+# honour make -s flag
+override V := $(if $(findstring s,$(MAKEFLAGS)),,$V)

 
 

-$O/presentacion.tex: presentacion.rst $(R2B)
-       @echo "$(R2B) $< > $@"
-       @$(R2B) $(R2BFLAGS) $< | $(R2BFILTER) > $@
+targets := presentacion.pdf

 
 

-$O/img/%.pdf: img/%.dot
-       @echo "$(DOT) $< > $@"
-       @$(DOT) $(DOTFLAGS) -Tpdf -o $@ $<
-       @#pdftops mark-sweep-$i.pdf && ps2pdf14 mark-sweep-$i.ps && rm mark-sweep-$i.ps
+.PHONY: all
+all: $(targets)
+
+%.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/$@ $@

 
 

-$O/img/%.pdf: img/%.aafig
-       @echo "$(AAFIG) $< > $@"
-       @$(AAFIG) $(AAFIGFLAGS) -t pdf -o $@ $<
+presentacion.pdf: $(imgs)
+
+$O/%.tex: %.rst $(R2B) $O/beamerthemeLuca.sty
+       $(if $V,@echo "$(R2B) $< > $@")
+       $V $(R2B) $(R2BFLAGS) $< | $(R2BFILTER) > $@
+
+$O/img/%.pdf: img/%.dot
+       $(DOT) $(DOTFLAGS) -Tpdf -o $@ $<

 
 $O/img/norm-hist-%.csv: img/raw-hist-%.csv
 
 $O/img/norm-hist-%.csv: img/raw-hist-%.csv

-       @echo "norm $< > $@"
-       @awk -F, -v m=`cut -d, -f4 $< | $(STATS) '$$1' '%(max)s'` \
+       $(if $V,@echo "norm $< > $@")
+       $V $(AWK) -F, -v m=`cut -d, -f4 $< | $(STATS) '$$1' '%(max)s'` \

                '{print $$1 "," $$2/m "," $$3/m "," $$4/m "," $$5/m}' \
                        $< > $@
 
 $O/img/norm-hist-%.eps: $(patsubst %,$O/img/norm-hist-\%-%.csv,$(PROGS))
                '{print $$1 "," $$2/m "," $$3/m "," $$4/m "," $$5/m}' \
                        $< > $@
 
 $O/img/norm-hist-%.eps: $(patsubst %,$O/img/norm-hist-\%-%.csv,$(PROGS))

-       @echo "plot $< > $@"
-       @$(TEMPLITE) "progs=($(patsubst %,'%'$(comma),$(PROGS))), " \
+       $(if $V,@echo "plot $< > $@")
+       $V $(TEMPLITE) "progs=($(patsubst %,'%'$(comma),$(PROGS))), " \

                        "files=($(patsubst %,'%'$(comma),$^))" \
                        < histogram-plot.tpl.gpi | $(GNUPLOT) > $@
 
 $O/img/norm-hist-%.pdf: $O/img/norm-hist-%.eps
                        "files=($(patsubst %,'%'$(comma),$^))" \
                        < histogram-plot.tpl.gpi | $(GNUPLOT) > $@
 
 $O/img/norm-hist-%.pdf: $O/img/norm-hist-%.eps

-       @echo "$(EPSTOPDF) $< > $@"
-       @$(EPSTOPDF) --outfile=$@ $<
+       $(EPSTOPDF) --outfile=$@ $<

 
 $O/img/%.pdf: img/%.pdf
 
 $O/img/%.pdf: img/%.pdf

-       @echo "cp $< > $@"
-       @cp $< $@
+       cp $< $@

 
 

-$O/heap.pdf: AAFIGFLAGS += -s 1.4 -a 0.8
+$O/%.sty: %.sty
+       cp $< $@

 
 .PHONY: clean
 clean:
 
 .PHONY: clean
 clean:


@@ -82,6 +89,6 @@ clean:
 
 .PHONY: clean-all
 clean-all: clean
 
 .PHONY: clean-all
 clean-all: clean

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

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