X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makefile;h=3fcb47e6d28c101b144a49828ea35f2d9bd1b96b;hb=6efd5ad0ff3ec6e5cd5931d63d21ded4be1ca73c;hp=0f1fe1da9361d02795ce84be7afc2dd538b80581;hpb=a73ae30c274c2e64aaa92a8dc163b509a1fe0499;p=ucwmac.git

diff --git a/Makefile b/Makefile
index 0f1fe1d..3fcb47e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,49 @@
-VERSION=1.0
+VERSION=2.0
 ARCHIVE=ucwmac-$(VERSION).tar.gz
 
-all: test.pdf test-labels.pdf
+all: test.pdf test-labels.pdf test-ref.pdf
 
-%.dvi: %.tex
-	csplain $<
+MACROS=$(wildcard ucw*.tex)
 
-%.ps: %.dvi
-	dvips -D600 -o $@ -t a4 $<
+ifdef USE_LUATEX
 
-%.pdf: %.tex
-	pdfcsplain $<
+LUATEX?=luatex
+export TEXINPUTS=.//:
+export LUAINPUTS=.//:
+
+%.pdf: %.tex $(MACROS) ucw-luacsplain.fmt
+	$(LUATEX) -file-line-error -fmt ucw-luacsplain $<
+	$(LUATEX) -file-line-error -fmt ucw-luacsplain $<
+
+%.fmt: %.ini
+	$(LUATEX) -file-line-error -jobname $* -ini $<
+
+.SECONDARY: ucw-luacsplain.fmt
+
+else ifdef USE_DVI
+
+%.dvi: %.tex $(MACROS)
+	csplain -file-line-error $<
+	csplain -file-line-error $<
+
+%.pdf: %.dvi
+	dvipdfm -r 600 -o $@ -p a4 $<
+
+else
+
+%.pdf: %.tex $(MACROS)
+	pdfcsplain -file-line-error $<
+	pdfcsplain -file-line-error $<
+
+endif
 
 clean:
-	rm -f *~ *.log *.dvi *.ps *.aux
+	rm -f *~ *.log *.dvi *.ps *.pdf *.aux *.fmt
 
 release:
 	git tag v$(VERSION)
 	git push --tags
 	git archive --format=tar --prefix=ucwmac-$(VERSION)/ HEAD | gzip >$(ARCHIVE)
-	scp $(ARCHIVE) atrey:~ftp/pub/local/mj/tex/
-	ssh jw "cd www && bin/release-prog ucwmac $(VERSION)"
-	mv $(ARCHIVE) ~/archives/mj/
+	scp $(ARCHIVE) jw:/srv/ftp/pub/mj/tex/
+	ssh jw "cd web && bin/release-prog ucwmac $(VERSION)"
+	mv $(ARCHIVE) ~/archives/sw/ucwmac