Merged in changes from the other main branch.

[cdsc_tex.git] / Makefile

diff --git a/Makefile b/Makefile
index 9aefb24158c900db3ab09e6e70c03ab0c7ead393..990fa79dd4cc5c7dca101309c5fb0f5f5e689cd2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,24 @@
-all: dvi
+#!/usr/bin/make
 
-dvi: text.tex
-       cp text.tex backup.tex
-       latex text.tex
-       bibtex text 
-       latex text.tex
-       latex text.tex
+all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
 
-pdf: dvi
-       pdflatex text.tex
 
-viewpdf: pdf
-       evince text.pdf
+%.pdf: %.png
+       png2pdf -p 1.4 -a $< $@
+
+%.pdf: %.tex 
+       rubber -fd $<
 
-ps: dvi
-       dvips -f < text.dvi  > text.ps
+clean: 
+       rubber -d --clean *.tex
+       rm -f *.tmp
+       rm -f figures/*.pdf
 
-final: dvi
-       dvips -f < text.dvi > final.ps
+viewpdf: pdf
+       evince text.pdf
 
 spell:
        aspell -c -t --tex-check-comments -b text.tex
 
-clean:
-       cp text.tex backup.tex
-       rm -f text.{blg,bbl,aux,log,dvi,toc,tex.bak,txt,tex~,ps,pdf} warnings
 
+.PHONY: clean all