Changeset e2e7330 for doc/user/Makefile

Timestamp:

Jan 31, 2018, 5:50:34 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

295e5071

Parents:

bc6f918 (diff), 281806b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• doc/user/Makefile (modified) (3 diffs)

doc/user/Makefile

@@ -1 @@
-## Define the appropriate configuration variables.
+## Define the configuration variables.
 
-TeXLIB = .:../LaTeXmacros:../bibliography/:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
+Build = build
+Figures = figures
+Macros = ../LaTeXmacros
+TeXLIB = .:${Macros}:${Build}:../bibliography:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+
+MAKEFLAGS = --no-print-directory --silent #
+VPATH = ${Figures}
 
 ## Define the text source files.
@@ -35 +41 @@
 # Directives #
 
+.PHONY : all clean                                      # not file names
+
 all : ${DOCUMENT}
 
 clean :
-        rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t *.cf \
-                ${FIGURES} ${PICTURES} ${PROGRAMS} ${GRAPHS} ${basename ${DOCUMENT}}.ps ${DOCUMENT}
+        @rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
 
 # File Dependencies #
@@ -47 +54 @@
 
 ${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
-        dvips $< -o $@
+        dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
-                ../LaTeXmacros/common.tex ../LaTeXmacros/lstlang.sty ../LaTeXmacros/indexstyle ../bibliography/cfa.bib
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+                ${Macros}/common.tex ${Macros}/lstlang.sty ${Macros}/indexstyle ../bibliography/pl.bib
         # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
-        if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi
+        if [ ! -r ${basename $@}.ind ] ; then touch ${Build}/${basename $@}.ind ; fi
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
-        -${BibTeX} ${basename $@}
-        # Some citations reference others so run steps again to resolve these citations
+        -${BibTeX} ${Build}/${basename $@}
+        # Some citations reference others so run again to resolve these citations
         ${LaTeX} ${basename $@}.tex
-        -${BibTeX} ${basename $@}
+        -${BibTeX} ${Build}/${basename $@}
         # Make index from *.aux entries and input index at end of document
-        makeindex -s ../LaTeXmacros/indexstyle ${basename $@}.idx
+        makeindex -s ${Macros}/indexstyle ${Build}/${basename $@}.idx
+        # Run again to finish citations
         ${LaTeX} ${basename $@}.tex
         # Run again to get index title into table of contents
         ${LaTeX} ${basename $@}.tex
 
-predefined :
-        sed -f predefined.sed ${basename ${DOCUMENT}}.tex > ${basename $@}.cf
-
 ## Define the default recipes.
 
+${Build}:
+        mkdir -p ${Build}
+
 %.tex : %.fig
-        fig2dev -L eepic $< > $@
+        fig2dev -L eepic $< > ${Build}/$@
 
 %.ps : %.fig
-        fig2dev -L ps $< > $@
+        fig2dev -L ps $< > ${Build}/$@
 
 %.pstex : %.fig
-        fig2dev -L pstex $< > $@
-        fig2dev -L pstex_t -p $@ $< > $@_t
+        fig2dev -L pstex $< > ${Build}/$@
+        fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
 
 # Local Variables: #