X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makerules;h=af8215cefabfe8c818cece60b6d017ed7dd85315;hb=3b6363b3c3be5b7c9d0b32464be02e20a8f7ee6b;hp=01e71faa89598dcefbff35620828e5bd02886c8d;hpb=81383c3b1ab213e35aaaf31e18368dde88b75656;p=ads2.git

diff --git a/Makerules b/Makerules
index 01e71fa..af8215c 100644
--- a/Makerules
+++ b/Makerules
@@ -1,35 +1,54 @@
-export TEXINPUTS=.:..:
+ifndef R
+R=..
+endif
 
-all: $P.ps
+export TEXINPUTS=.:$(R):
 
-%.dvi: %.tex ../lecnotes.tex ../mjmac.tex
-	csplain $<
+all: $P.pdf
 
-#%.pdf: %.tex ../lecnotes.tex ../mjmac.tex
-#	pdfcsplain $<
+%.dvi: %.tex $(R)/lecnotes.tex $(R)/mjmac.tex
+	csplain $<
 
 %.ps: %.dvi
 	dvips -D600 -o $@ -O-15.4mm,-15.4mm -t a5 $<
 
-%.pdf: %.dvi
-	dvipdfm -o $@ -x 9mm -y 9mm -p a5 -r 600 -z 9 $<
+#%.pdf: %.dvi
+#	dvipdfm -o $@ -x 9mm -y 9mm -p a5 -r 600 -z 9 $<
+
+%.pdf: %.ps
+	ps2pdf13 $< $@
 
-%-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/' >$@
+%-booklet.pdf: %.pdf
+	pspdftool 'book nup(2, paper=a4)' $< $@
 
-%-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/' >$@
+%-2in1.pdf: %.pdf
+	pspdftool 'nup(2, paper=a4)' $< $@
+
+#%-booklet.ps: %.ps
+#	psbook <$< | pstops '2:0L(210mm,0)+1L(210mm,148mm)' | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+#
+#%-2in1.ps: %.ps
+#	pstops '2:0L(210mm,0mm)+1L(210mm,148mm)' <$< | ../utils/pstopsfix | sed 's/^%%BoundingBox: .*/%%BoundingBox: 0 0 595 842/;s/^%%DocumentPaperSizes:.*/%%DocumentPaperSizes: a4\n%%Orientation: Landscape/' >$@
+
+%.stamp: force
+	date '+%Y-%m-%d' >$@
+
+force:
 
 mostlyclean:
 	rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg
 
 clean:: mostlyclean
-	rm -f *.ps *.pdf
+	rm -f *.ps *.pdf *.stamp
 
+UPDIR=vyuka/0910/ads2
 ifndef CUSTOM_UPLOAD
 upload::
-	make $P-booklet.ps
-	scp -C $P-booklet.ps jabberwock:www/vyuka/0607/ads1/$P-booklet.ps
+	make $P.pdf $P.stamp
+	scp -C $P.pdf $P.stamp jabberwock:www/$(UPDIR)/
+	ssh jabberwock 'cd www && make'
 endif
 
 .SECONDARY:
+
+.PHONY: force upload clean mostlyclean