Changeset b1e63ac5 for doc/proposals/concurrency/Makefile

Timestamp:

Jul 4, 2017, 9:40:16 AM (8 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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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' into references

File:

• doc/proposals/concurrency/Makefile (modified) (4 diffs)

doc/proposals/concurrency/Makefile

@@ -1 +1 @@
 ## Define the appropriate configuration variables.
 
-TeXLIB = .:../../LaTeXmacros:../../LaTeXmacros/listings:../../LaTeXmacros/enumitem:~/bibliographies:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
-BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
+TeXLIB = .:./style:./text:./annex:./build:../../LaTeXmacros:../../LaTeXmacros/listings:../../LaTeXmacros/enumitem:~/bibliographies:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=build -interaction=nonstopmode
+BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex -terse
 
 ## Define the text source files.
 
 SOURCES = ${addsuffix .tex, \
-concurrency \
-style \
-cfa-format \
-glossary \
+thesis \
+style/style \
+style/cfa-format \
+annex/glossary \
+text/intro \
+text/cforall \
+text/basics \
+text/concurrency \
+text/parallelism \
 }
 
-FIGURES = ${addsuffix .tex, \
+FIGURES = ${addprefix build/, ${addsuffix .tex, \
         monitor \
         ext_monitor \
-}
+}}
 
 PICTURES = ${addsuffix .pstex, \
@@ -30 +35 @@
 ## Define the documents that need to be made.
 
-DOCUMENT = concurrency.pdf
+DOCUMENT = thesis.pdf
 
 # Directives #
@@ -37 +42 @@
 
 clean :
-        rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t *.cf *.glg *.glo *.gls *.ist *.acn *.acr *.alg \
-                ${FIGURES} ${PICTURES} ${PROGRAMS} ${GRAPHS} ${basename ${DOCUMENT}}.ps ${DOCUMENT}
+        @rm -fv ${DOCUMENT} \
+        build/*.acn     \
+        build/*.acr     \
+        build/*.alg     \
+        build/*.aux     \
+        build/*.bbl     \
+        build/*.blg     \
+        build/*.brf     \
+        build/*.cf      \
+        build/*.dvi     \
+        build/*.glg     \
+        build/*.glo     \
+        build/*.gls     \
+        build/*.ist     \
+        build/*.idx     \
+        build/*.ilg     \
+        build/*.ind     \
+        build/*.log     \
+        build/*.out     \
+        build/*.ps      \
+        build/*.pstex_t \
+        build/*.tex     \
+        build/*.toc     \
+
 
 # File Dependencies #
 
-${DOCUMENT} : ${basename ${DOCUMENT}}.ps
+${DOCUMENT} : build/${basename ${DOCUMENT}}.ps
         ps2pdf $<
 
-${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
+build/${basename ${DOCUMENT}}.ps : build/${basename ${DOCUMENT}}.dvi
         dvips $< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
-                ../../LaTeXmacros/common.tex ../../LaTeXmacros/indexstyle
-        # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
-        if [ ! -r ${basename $@}.ind ] ; then touch ${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
-        ${LaTeX} ${basename $@}.tex
-        -${BibTeX} ${basename $@}
-        # Make index from *.aux entries and input index at end of document
-        makeglossaries ${basename $@}
-        #${LaTeX} ${basename $@}.tex
-        # Run again to get index title into table of contents
-        ${LaTeX} ${basename $@}.tex
-        -./bump_ver.sh
-        ${LaTeX} ${basename $@}.tex
+build/${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../../LaTeXmacros/common.tex ../../LaTeXmacros/indexstyle
+
+        @ if [ ! -r ${basename $@}.ind ] ; then touch ${basename $@}.ind ; fi                           # Conditionally create an empty *.ind (index) file for inclusion until makeindex is run.
+        @ echo "Citation lookup"                                                                                        # Must have *.aux file containing citations for bibtex
+        @ if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename ${notdir $@}}.tex ; fi
+        @ echo "Citation Pass 1"
+        @ -${BibTeX} ${basename $@}                                                                                     # Some citations reference others so run steps again to resolve these citations
+        @ echo "Citation Pass 2"
+        @ ${LaTeX} ${basename ${notdir $@}}.tex
+        @ -${BibTeX} ${basename $@}
+        @ echo "Glossary"
+        makeglossaries -q -s ${basename $@}.ist ${basename $@}                                          # Make index from *.aux entries and input index at end of document
+        @ echo ".dvi generation"
+        @ -build/bump_ver.sh
+        @ ${LaTeX} ${basename ${notdir $@}}.tex                                                                 # Run again to get index title into table of contents
 
 
@@ -72 +97 @@
 ## Define the default recipes.
 
-%.tex : %.fig
+build/%.tex : figures/%.fig
         fig2dev -L eepic $< > $@
 
-%.ps : %.fig
+build/%.ps : figures/%.fig
         fig2dev -L ps $< > $@
 
-%.pstex : %.fig
+build/%.pstex : figures/%.fig
         fig2dev -L pstex $< > $@
         fig2dev -L pstex_t -p $@ $< > $@_t