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

[ga.git] / Makerules

diff --git a/Makerules b/Makerules
index 01aac02bac15e8e9438a56c824c5a3fa3839f7f4..5c4c60490b1221cafc914cc77d9eff81a45228ee 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1,22 +1,22 @@
-export TEXINPUTS=.:..:
+export TEXINPUTS=.:..//:
 
 all: $P.pdf
 
-%.dvi: %.tex ../sgr.tex ../ga.bib
-       csplain $< && if grep -q citation $*.aux ; then bibtex $* && csplain $< && csplain $< ; fi
+%.pdf: %.tex ../sgr.tex ../ga.bib
+       pdfcsplain $< && if grep -q citation $*.aux ; then bibtex $* && pdfcsplain $< && pdfcsplain $< ; fi
 
-%.ps: %.dvi
-       dvips -D600 -o $@ -O-15.4mm,-15.4mm -t a5 $<
-
-%.pdf: %.ps
-       ps2pdf $< $@
-
-%-2in1.pdf: %.pdf
+%-2in1.pdf: %-uncompressed.pdf
        pspdftool 'nup(2, paper=a4)' $< $@
 
-%-booklet.pdf: %.pdf
+%-booklet.pdf: %-uncompressed.pdf
        pspdftool 'book nup(2, paper=a4)' $< $@
 
+%-uncompressed.pdf: %.pdf
+       qpdf --object-streams=disable --stream-data=uncompress $< $@
+
+%.pdf: %.asy
+       asy -f pdf -tex pdftex $<
+
 mostlyclean:
        rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg *.toc
 
@@ -26,7 +26,8 @@ clean:: mostlyclean
 ifndef CUSTOM_UPLOAD
 upload::
        make $P.pdf
-       scp -C $P.pdf jabberwock:www/vyuka/ga/
+       scp -C $P.pdf jabberwock:www/static/vyuka/ga/
+       ssh jabberwock 'cd web && make'
 endif
 
 .SECONDARY: