Changes in doc/papers/general/Makefile [5ff188f:a43dd54]

File:

• doc/papers/general/Makefile (modified) (3 diffs)

doc/papers/general/Makefile

@@ -2 +2 @@
 
 Build = build
-Figures = figures
 Macros = ../../LaTeXmacros
 TeXLIB = .:${Macros}:${Build}:../../bibliography:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build} -interaction=nonstopmode
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures} evaluation
 
 ## Define the text source files.
@@ -36 +34 @@
 # Directives #
 
-.PHONY : all clean                                      # not file names
+.PHONY : all clean                                                                              # not file names
 
 all : ${DOCUMENT}
@@ -52 +50 @@
 
 ${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
-                ${Macros}/common.tex ${Macros}/indexstyle ../../bibliography/pl.bib
-        # Must have *.aux file containing citations for bibtex
-        if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
-        -${BibTeX} ${Build}/${basename $@}
-        # Some citations reference others so run again to resolve these citations
+                        ${Macros}/common.tex ${Macros}/indexstyle ../../bibliography/cfa.bib
+        if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi # Must have *.aux file containing citations for bibtex
+        -${BibTeX} ${Build}/${basename $@}                                      # Some citations reference others so run again to resolve these citations
         ${LaTeX} ${basename $@}.tex
         -${BibTeX} ${Build}/${basename $@}
-        # Run again to finish citations
-        ${LaTeX} ${basename $@}.tex
+        ${LaTeX} ${basename $@}.tex                                                     # Finish citations
 
 ## Define the default recipes.
+
+vpath %.tex ${subst .zzz,,${subst .zzz ,:,${SOURCES}}}  # add prefix for source
+vpath %.fig ${subst .zzz,,${subst .zzz ,:,${SOURCES}}}  # add prefix for source
 
 ${Build}:
         mkdir -p ${Build}
 
-${GRAPHS} : timing.gp timing.dat
-        gnuplot -e Build="'${Build}/'" evaluation/timing.gp
+${GRAPHS} : evaluation/timing.gp evaluation/timing.dat
+        gnuplot evaluation/timing.gp
 
-%.tex : %.fig
+%.tex : figures/%.fig
         fig2dev -L eepic $< > ${Build}/$@
 
-%.ps : %.fig
+%.ps : figures/%.fig
         fig2dev -L ps $< > ${Build}/$@
 
-%.pstex : %.fig
+%.pstex : figures/%.fig
         fig2dev -L pstex $< > ${Build}/$@
         fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
 
 # Local Variables: #
+# tab-width : 4 #
 # compile-command: "make" #
 # End: #