Hradla: Uklid maker

[ads2.git] / Makerules

diff --git a/Makerules b/Makerules
index 4898d803bda3428dd3be1b36351ec577155bac35..b65bc88553464b00f0ef4c9f6f319a4cd405f551 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1,33 +1,15 @@
-ifndef R
-R=..
-endif
-
-export TEXINPUTS=.:$(R):
+export TEXINPUTS=.:..:../ucw:
 
-all: $P.pdf
+all: $P.ps $P.pdf
 
-%.dvi: %.tex $(R)/lecnotes.tex $(R)/mjmac.tex
+%.dvi: %.tex ../lecnotes.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 $<
+       dvips -D600 -o $@ -t a5 $<
 
 %.pdf: %.ps
-       ps2pdf13 $< $@
-
-%-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:
+       ps2pdf $< $@
 
 mostlyclean:
        rm -f *.dvi *.log *~ core *.o *.aux *.bbl *.blg
@@ -35,14 +17,13 @@ mostlyclean:
 clean:: mostlyclean
        rm -f *.ps *.pdf
 
-UPDIR=vyuka/0910/ads2
+UPDIR=vyuka/1112/ads2
+
 ifndef CUSTOM_UPLOAD
 upload::
-       make $P.pdf $P.stamp
-       scp -C $P.pdf $P.stamp jabberwock:www/$(UPDIR)/
-       ssh jabberwock 'cd www && make'
+       make $P.pdf
+       rsync $P.pdf jabberwock:www/$(UPDIR)/$P.pdf
+       ssh jabberwock 'cd www && date "+%Y-%m-%d" >$(UPDIR)/$(P).stamp && make'
 endif
 
 .SECONDARY:
-
-.PHONY: force upload clean mostlyclean