diff --git a/Makefile b/Makefile index 43b7216..bb5f718 100644 --- a/Makefile +++ b/Makefile @@ -134,6 +134,10 @@ ifndef DVIVIEWER DVIVIEWER=xdvi endif +ifndef PDFVIEWER +PDFVIEWER=acroread +endif + ifndef LATEX2HTML LATEX2HTML=latex2html endif @@ -271,21 +275,6 @@ TEXFILES=$(wildcard *.tex) touch $*.ind; \ fi -latex: -# Below the 'true' is included to prevent unnecessarily many errors. - @if [ -n "${LATEXTARGET}" ]; then \ - $(MAKE) ${LATEXTARGET}.dvi; \ - true; \ - else \ - if [ `ls *.tex | wc -l` = "1" ]; then \ - $(MAKE) `basename \`ls *.tex\` .tex`.dvi; \ - true; \ - else \ - $(MAKE) `echo $$PWD|tr '/' '\n'|tail -1`.dvi; \ - true; \ - fi; \ - fi - pdflatex: # Below the 'true' is included to prevent unnecessarily many errors. @if [ -n "${LATEXTARGET}" ]; then \ @@ -301,12 +290,27 @@ pdflatex: fi; \ fi +latex: +# Below the 'true' is included to prevent unnecessarily many errors. + @if [ -n "${LATEXTARGET}" ]; then \ + $(MAKE) ${LATEXTARGET}.dvi; \ + true; \ + else \ + if [ `ls *.tex | wc -l` = "1" ]; then \ + $(MAKE) `basename \`ls *.tex\` .tex`.dvi; \ + true; \ + else \ + $(MAKE) `echo $$PWD|tr '/' '\n'|tail -1`.dvi; \ + true; \ + fi; \ + fi + latexfigures: @for i in $(FIGUREOBJS); do \ $(MAKE) $$i; \ done -view: +viewdvi: # Below the 'true' is included to prevent unnecessarily many errors. @if [ -n "${LATEXTARGET}" ]; then \ $(MAKE) ${LATEXTARGET}.dvi && \ @@ -324,6 +328,24 @@ view: fi; \ fi +view: +# Below the 'true' is included to prevent unnecessarily many errors. + @if [ -n "${LATEXTARGET}" ]; then \ + $(MAKE) ${LATEXTARGET}.pdf && \ + $(PDFVIEWER) ${LATEXTARGET}.pdf; \ + true; \ + else \ + if [ `ls *.tex | wc -l` = "1" ]; then \ + $(MAKE) `basename \`ls *.tex\` .tex`.pdf && \ + $(PDFVIEWER) `basename \`ls *.tex\` .tex`.pdf; \ + true; \ + else \ + $(MAKE) `echo $$PWD|tr '/' '\n'|tail -1`.pdf && \ + $(PDFVIEWER) `echo $$PWD|tr '/' '\n'|tail -1`.pdf; \ + true; \ + fi; \ + fi + %.ps: %.dvi $(DVIPS) -o $@ $<