Changeset 85521c7 for doc/theses/thierry_delisle

Timestamp:

Feb 1, 2018, 5:40:01 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

0188a0bc

Parents:

d0a045c7 (diff), 33c0ce8 (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:software/cfa/cfa-cc

Location:

doc/theses/thierry_delisle

Files:

• Makefile (modified) (4 diffs)
• version (modified) (1 diff)
• version.sh (moved) (moved from doc/theses/thierry_delisle/build/bump_ver.sh)

doc/theses/thierry_delisle/Makefile ¶

@@ -1 @@
-## Define the appropriate configuration variables.
+## Define the configuration variables.
 
-TeXLIB = .:./style:./text:./annex:./build:../../LaTeXmacros:../../LaTeXmacros/listings:../../LaTeXmacros/enumitem:~/bibliographies:/usr/local/bibliographies:
-LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=build -interaction=nonstopmode
+Build = build
+Figures = figures
+Macros = ../../LaTeXmacros
+TeXLIB = .:style:text:annex:${Macros}:${Build}:../../bibliography:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
 BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex -terse
+
+MAKEFLAGS = --no-print-directory --silent #
+VPATH = ${Build} ${Figures}
 
 ## Define the text source files.
@@ -24 +30 @@
 }
 
-FIGURES = ${addprefix build/, ${addsuffix .tex, \
-        monitor \
-        ext_monitor \
-        int_monitor \
-        dependency \
-}}
+FIGURES = ${addsuffix .tex, \
+monitor \
+ext_monitor \
+int_monitor \
+dependency \
+}
 
-PICTURES = ${addprefix build/, ${addsuffix .pstex, \
-        system \
-        monitor_structs \
-}}
+PICTURES = ${addsuffix .pstex, \
+system \
+monitor_structs \
+}
 
 PROGRAMS = ${addsuffix .tex, \
@@ -48 +54 @@
 # Directives #
 
+.PHONY : all clean                                      # not file names
+
 all : ${DOCUMENT}
 
 clean :
-        @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   \
-        build/*.pstex_t \
-        build/*.tex     \
-        build/*.toc     \
-        build/*.lof     \
-        build/*.lol     \
-        build/*.lot     \
-        figures/*.tex   \
-        *.png           \
-
+        @rm -frv ${DOCUMENT} ${basename ${DOCUMENT}}.ps ${Build}
 
 # File Dependencies #
 
-${DOCUMENT} : build/${basename ${DOCUMENT}}.ps
+${DOCUMENT} : ${basename ${DOCUMENT}}.ps
         ps2pdf $<
 
-build/${basename ${DOCUMENT}}.ps : build/${basename ${DOCUMENT}}.dvi
-        dvips $< -o $@
+${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
+        dvips ${Build}/$< -o $@
 
-build/${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../../LaTeXmacros/common.tex ../../LaTeXmacros/indexstyle annex/local.bib
-
-        @ 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
-
-
-predefined :
-        sed -f predefined.sed ${basename ${DOCUMENT}}.tex > ${basename $@}.cf
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
+                ${Macros}/common.tex ${Macros}/indexstyle annex/local.bib ../../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
+        ${LaTeX} ${basename $@}.tex
+        -${BibTeX} ${Build}/${basename $@}
+        # Make index from *.aux entries and input index at end of document
+        makeglossaries -q -s ${Build}/${basename $@}.ist ${Build}/${basename $@}
+        -version.sh
+        # Run again to finish citations
+        ${LaTeX} ${basename $@}.tex
 
 ## Define the default recipes.
 
-build/%.tex : figures/%.fig
-        fig2dev -L eepic $< > $@
+${Build}:
+        mkdir -p ${Build}
 
-build/%.ps : figures/%.fig
-        fig2dev -L ps $< > $@
+%.tex : %.fig
+        fig2dev -L eepic $< > ${Build}/$@
 
-build/%.pstex : figures/%.fig
-        fig2dev -L pstex $< > $@
-        fig2dev -L pstex_t -p $@ $< > $@_t
+%.ps : %.fig
+        fig2dev -L ps $< > ${Build}/$@
+
+%.pstex : %.fig
+        fig2dev -L pstex $< > ${Build}/$@
+        fig2dev -L pstex_t -p ${Build}/$@ $< > ${Build}/$@_t
 
 #-----------------------------------------------------------------------------------
@@ -145 +121 @@
                         "\end{document}" > $@
 
-
-
 # Local Variables: #
 # compile-command: "make" #

doc/theses/thierry_delisle/version ¶

@@ -1 @@
-0.11.403
+0.11.409