--- trunk/mdRipple/Makefile	2007/07/13 18:10:52	3173
+++ trunk/mdRipple/Makefile	2007/07/13 22:01:52	3174
@@ -1,12 +1,21 @@
+LBIN =/usr/local/bin
 LC = latex
 BC = bibtex
 PDF = Preview
+D2PS = $(LBIN)/dvips
+D2PDF = dvipdf
+XDVI = $(LBIN)/xdvi
+KDVI = kdvi
 
 .SUFFIXES: $(SUFFIXES) .dvi .ps .bib .tex .bbl .pdf
 
 PAPER_ROOT = mdripple
 
-PICTURES   = \
+PICTURES   = lipidMM.eps \
+	     phaseCartoon.eps \
+	     rP2.eps \
+	     sP2.eps \
+	     tP2.eps
 
 INFILES    = \
 	mdripple.tex \
@@ -16,20 +25,53 @@ all:: ${PAPER_ROOT}.view
 # standard rules:
 #
 
+PSVIEWER = kghostview
+PDFVIEWER = kpdf
+
+# ".dvi.ps" is the old-fashioned suffix rules = "%.ps: %.dvi"
+#.dvi.ps:
+%.ps: %.dvi
+	touch $*.ps
+	/bin/rm $*.ps
+	@echo "compiling $*"
+	$(D2PS) -o $*.ps $<
+
+.dvi.pdf:
+	touch $*.pdf
+	/bin/rm $*.pdf
+	@echo "compiling $*"
+	$(D2PDF) $< $*.pdf 
+
 all:: ${PAPER_ROOT}.view
 
+dview:: ${PAPER_ROOT}.view
+
+ps:: ${PAPER_ROOT}.psview
+
+pdf:: ${PAPER_ROOT}.pdfview
+
 ${PAPER_ROOT}.dvi: ${INFILES} ${PICTURES}
-	$(LC) ${PAPER_ROOT}
+	$(LC) --src-specials ${PAPER_ROOT}
 	$(BC) ${PAPER_ROOT}
-	$(LC) ${PAPER_ROOT}
-	$(LC) ${PAPER_ROOT}
+	$(LC) --src-specials ${PAPER_ROOT}
+	$(LC) --src-specials ${PAPER_ROOT}
 
-${PAPER_ROOT}.view: ${PAPER_ROOT}.dvi
-	dvipdf ${PAPER_ROOT}
-	osascript "reload_preview.scpt" ${PAPER_ROOT}.pdf	
-	open -a $(PDF) ${PAPER_ROOT}.pdf
+current.psview: current.ps
+	${PSVIEWER} current.ps
 
-clean::
-	/bin/rm -f *.aux *.log *.bbl *.blg *.dvi *.tbx *.fgx *~ *.fff *.lof *.lot mdripple.pdf *.ttt
+${PAPER_ROOT}.psview: ${PAPER_ROOT}.ps
+	${PSVIEWER} ${PAPER_ROOT}.ps
 
+${PAPER_ROOT}.pdfview: ${PAPER_ROOT}.pdf
+	${PDFVIEWER} ${PAPER_ROOT}.pdf
 
+#${PAPER_ROOT}.view: ${PAPER_ROOT}.dvi
+#	$(XDVI) -fg black ${PAPER_ROOT}
+
+print: ${PAPER_ROOT}.ps ${PAPER_ROOT}.pdf
+
+${PAPER_ROOT}.view: ${PAPER_ROOT}.dvi
+	$(KDVI) ${PAPER_ROOT}
+
+clean::
+	/bin/rm -f *.aux *.log *.bbl *.blg *.dvi *.tbx *.fgx *~ *.fff *.lof *.lot mdripple.ps mdripple.pdf *.ttt