Add FIGS variable to asyprocess Makefiles to reduce duplication

Also moved the other two schematic ASY figures over from external
builds to asyfig.

diff --git a/tex/src/figures/cantilever-data/Makefile b/tex/src/figures/cantilever-data/Makefile
index 30e11c1e85fce3fd6499940dbbcb77a6cfd976fd..6f968f86e0c140b6c27b241c2c117e02f2ac4da8 100644 (file)
--- a/tex/src/figures/cantilever-data/Makefile
+++ b/tex/src/figures/cantilever-data/Makefile
@@ -3,10 +3,12 @@ ASYPROCESS = ../asy/asyprocess \
   --pretex='\documentclass{drexel-thesis} \input{packages}' \
   --
 
-all : loading-rate_.tex sim-loading-rate_.tex v_dep_.tex
+FIGS = loading-rate sim-loading-rate v-dep i-dep 
+
+all : $(FIGS:%=%_.tex)
 
 clean :
-       rm -f loading-rate{_,-}* sim-loading-rate{_,-}* v-dep{_,-}*
+       rm -f $(FIGS:%=%_*) $(FIGS:%=%-*)
 
 %_.tex : %.asy
        $(ASYPROCESS) $(patsubst %.asy, %, $<)

diff --git a/tex/src/figures/schematic/Makefile b/tex/src/figures/schematic/Makefile
index 4561234da3124ad40d8667993150099d4a35daa1..73d1d0ccda6758763f714fe5c7c8f12ccc4d5579 100644 (file)
--- a/tex/src/figures/schematic/Makefile
+++ b/tex/src/figures/schematic/Makefile
@@ -3,13 +3,12 @@ ASYPROCESS = ../asy/asyprocess \
   --pretex='\documentclass{drexel-thesis} \input{packages}' \
   --
 
-all : unfolding.pdf afm.pdf landscape-cant_.tex
+FIGS = unfolding afm landscape-cant
 
-clean :
-       rm -f unfolding.pdf afm.pdf landscape-cant{_,-}*
+all : $(FIGS:%=%_.tex)
 
-%.pdf : %.asy base_afm.asy
-       asy -f pdf $<
+clean :
+       rm -f $(FIGS:%=%_*) $(FIGS:%=%-*)
 
 %_.tex : %.asy
        $(ASYPROCESS) $(patsubst %.asy, %, $<)

diff --git a/tex/src/introduction/main.tex b/tex/src/introduction/main.tex
index adbfce1630c5f274b71209df86df55ecc9e7fc6a..802664e7f2f036240c558661d0472397a8b1ac46 100644 (file)
--- a/tex/src/introduction/main.tex
+++ b/tex/src/introduction/main.tex
@@ -132,14 +132,12 @@ significant and unique information about protein folding has
 stimulated much effort in both experimental and theoretical research.
 
 \begin{figure}
-  \begin{center}
-  \includegraphics{figures/schematic/afm}%
+  \asyfig{figures/schematic/afm}%
   \caption{Operating principle for Atomic Force Microscopy.  A sharp
     tip integrated at the end of a cantilever interacts with the
     sample.  Cantilever bending is measured by a laser reflected off
     the cantilever and incident on a position sensitive
     photodetector.\label{fig:afm-schematic}}
-  \end{center}
 \end{figure}
 
 
@@ -176,7 +174,7 @@ time, facilitating single molecule studies.
 
 \begin{figure}
   \begin{center}
-  \subfloat[][]{\includegraphics{figures/schematic/unfolding}%
+  \subfloat[][]{\asyfig{figures/schematic/unfolding}%
     \label{fig:unfolding-schematic}}
   % \hspace{.25in}%
   \subfloat[][]{\includegraphics{figures/expt-sawtooth/fig}%