--- trunk/oopsePaper/Makefile	2003/09/19 19:16:36	775
+++ trunk/oopsePaper/Makefile	2004/07/29 20:06:07	1439
@@ -1,4 +1,4 @@
-LBIN =/usr/local/teTeX/bin
+LBIN =/usr/local/bin
 LC = $(LBIN)/latex
 BC = $(LBIN)/bibtex
 D2PS = $(LBIN)/dvips
@@ -7,19 +7,9 @@ PAPER_ROOT = oopse
 
 .SUFFIXES: $(SUFFIXES) .dvi .ps .bib .tex .bbl .pdf
 
-PAPER_ROOT = oopse
-PICTURES   = lipidModel.epsi \
-	     dynamicPropsMem.eps
+PAPER_ROOT = oopsePaper
+PICTURES   = 
 
-# list section files in order of inclusion
-INFILES = preamble.tex \
-	  titleAbstract.tex \
-	  ssd.tex \
-	  DUFF.tex \
-	  analysis.tex \
-	  acknowledgements.tex \
-	  bibEnd.tex
-
 #
 # A very cool hack to "do the right thing":
 PSVIEWER = ghostview
@@ -39,8 +29,10 @@ all:: ${PAPER_ROOT}.psview
 	@echo "compiling $*"
 	$(D2PDF) $< $*.pdf 
 
-all:: ${PAPER_ROOT}.psview
+all:: ${PAPER_ROOT}.view
 
+dview:: ${PAPER_ROOT}.view
+
 current:: current.psview
 
 outline:: ${OUTLINE}.view
@@ -49,11 +41,7 @@ ${PAPER_ROOT}.dvi: ${INFILES} ${PAPER_ROOT}.bib ${PICT
 
 print: ${PAPER_ROOT}.ps  ${PAPER_ROOT}.pdf
 
-${PAPER_ROOT}.dvi: ${INFILES} ${PAPER_ROOT}.bib ${PICTURES}
-	/bin/rm -rf ${PAPER_ROOT}.tex
-	for i in ${INFILES}; \
-	do cat $$i >> ${PAPER_ROOT}.tex; \
-	done;
+${PAPER_ROOT}.dvi: ${PAPER_ROOT}.tex ${PAPER_ROOT}.bib
 	$(LC) ${PAPER_ROOT}
 	$(BC) ${PAPER_ROOT}
 	$(LC) ${PAPER_ROOT}
@@ -69,6 +57,6 @@ clean::
 	$(XDVI) -fg black ${PAPER_ROOT}
 
 clean::
-	/bin/rm -f *.aux *.log *.bbl *.blg *.dvi *.tbx *.fgx *~ *.fff *.lof mule.*
+	/bin/rm -f *.aux *.log *.bbl *.blg *.dvi *.tbx *.fgx *~ *.fff *.lof mule.* *.lot *.ttt