Changes in doc/proposals/concurrency/Makefile [ff98952:0f9bef3]

File:

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

doc/proposals/concurrency/Makefile ¶

@@ -1 +1 @@
 ## Define the appropriate configuration variables.
 
-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
+TeXLIB = .:../../LaTeXmacros:../../LaTeXmacros/listings:../../LaTeXmacros/enumitem:~/bibliographies:
+LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error
+BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
 
 ## Define the text source files.
 
 SOURCES = ${addsuffix .tex, \
-thesis \
-style/style \
-style/cfa-format \
-annex/glossary \
-text/intro \
-text/basics \
-text/concurrency \
-text/parallelism \
+concurrency \
+style \
+cfa-format \
+glossary \
 }
 
-FIGURES = ${addprefix build/, ${addsuffix .tex, \
+FIGURES = ${addsuffix .tex, \
         monitor \
         ext_monitor \
-}}
+}
 
 PICTURES = ${addsuffix .pstex, \
@@ -34 +30 @@
 ## Define the documents that need to be made.
 
-DOCUMENT = thesis.pdf
+DOCUMENT = concurrency.pdf
 
 # Directives #
@@ -41 +37 @@
 
 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_t \
-        build/*.tex     \
-        build/*.toc     \
-
+        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}
 
 # File Dependencies #
 
-${DOCUMENT} : build/${basename ${DOCUMENT}}.ps
+${DOCUMENT} : ${basename ${DOCUMENT}}.ps
         ps2pdf $<
 
-build/${basename ${DOCUMENT}}.ps : build/${basename ${DOCUMENT}}.dvi
+${basename ${DOCUMENT}}.ps : ${basename ${DOCUMENT}}.dvi
         dvips $< -o $@
 
-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
+${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
 
 
@@ -96 +72 @@
 ## Define the default recipes.
 
-build/%.tex : figures/%.fig
+%.tex : %.fig
         fig2dev -L eepic $< > $@
 
-build/%.ps : figures/%.fig
+%.ps : %.fig
         fig2dev -L ps $< > $@
 
-build/%.pstex : figures/%.fig
+%.pstex : %.fig
         fig2dev -L pstex $< > $@
         fig2dev -L pstex_t -p $@ $< > $@_t