Merge branch 'master' of git+ssh://git.ucw.cz/home/mj/GIT/ga

[ga.git] / Makerules

diff --git a/Makerules b/Makerules
index f4dd3d858f246a998de84ff56eb5735fec88849e..5c4c60490b1221cafc914cc77d9eff81a45228ee 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1,21 +1,21 @@
-export TEXINPUTS=.:..:
+export TEXINPUTS=.:..//:
 
-all: $P.ps
-
-%.dvi: %.tex ../sgr.tex ../ga.bib
-       csplain $< && if grep -q citation $*.aux ; then bibtex $* && csplain $< && csplain $< ; fi
+all: $P.pdf
 
 %.pdf: %.tex ../sgr.tex ../ga.bib
-       pdfcsplain $<
+       pdfcsplain $< && if grep -q citation $*.aux ; then bibtex $* && pdfcsplain $< && pdfcsplain $< ; fi
+
+%-2in1.pdf: %-uncompressed.pdf
+       pspdftool 'nup(2, paper=a4)' $< $@
 
-%.ps: %.dvi
-       dvips -D600 -o $@ -O-15.4mm,-15.4mm -t a5 $<
+%-booklet.pdf: %-uncompressed.pdf
+       pspdftool 'book nup(2, paper=a4)' $< $@
 
-%-booklet.ps: %.ps
-       psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+%-uncompressed.pdf: %.pdf
+       qpdf --object-streams=disable --stream-data=uncompress $< $@
 
-%-2in1.ps: %.ps
-       pstops '2:0L(210mm,0mm)+1L(210mm,148mm)' <$< | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+%.pdf: %.asy
+       asy -f pdf -tex pdftex $<
 
 mostlyclean:
        rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg *.toc
@@ -25,8 +25,9 @@ clean:: mostlyclean
 
 ifndef CUSTOM_UPLOAD
 upload::
-       make $P-booklet.ps
-       scp -C $P-booklet.ps jabberwock:www/vyuka/ga/$P-booklet.ps
+       make $P.pdf
+       scp -C $P.pdf jabberwock:www/static/vyuka/ga/
+       ssh jabberwock 'cd web && make'
 endif
 
 .SECONDARY: