Changeset 0fe4e62 for doc/proposals/concurrency/Makefile

Timestamp:

Nov 17, 2017, 10:56:16 AM (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:

cdbfab0

Parents:

f5c3b6c (diff), b7f8cb4 (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 fix-bug-51

File:

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

doc/proposals/concurrency/Makefile

@@ -13 +13 @@
 annex/glossary \
 text/intro \
+text/basics \
 text/cforall \
-text/basics \
 text/concurrency \
 text/internals \
 text/parallelism \
+text/results \
 text/together \
 text/future \
@@ -29 +30 @@
 }}
 
-PICTURES = ${addsuffix .pstex, \
-}
+PICTURES = ${addprefix build/, ${addsuffix .pstex, \
+        system \
+        monitor_structs \
+}}
 
 PROGRAMS = ${addsuffix .tex, \
@@ -67 +70 @@
         build/*.out     \
         build/*.ps      \
+        build/*.pstex   \
         build/*.pstex_t \
         build/*.tex     \
@@ -80 +84 @@
         dvips $< -o $@
 
-build/${basename ${DOCUMENT}}.dvi : Makefile ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../../LaTeXmacros/common.tex ../../LaTeXmacros/indexstyle
+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.
@@ -91 +95 @@
         @ -${BibTeX} ${basename $@}
         @ echo "Glossary"
-        makeglossaries -q -s ${basename $@}.ist ${basename $@}                                          # Make index from *.aux entries and input index at end of document
+        @ 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