Changeset 3f7e12cb for doc/proposals/concurrency/Makefile

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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

File:

• doc/proposals/concurrency/Makefile (modified) (3 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 \
 }
 
@@ -23 +27 @@
         ext_monitor \
         int_monitor \
+        dependency \
 }}
 
-PICTURES = ${addsuffix .pstex, \
-}
+PICTURES = ${addprefix build/, ${addsuffix .pstex, \
+        system \
+}}
 
 PROGRAMS = ${addsuffix .tex, \
@@ -63 +69 @@
         build/*.out     \
         build/*.ps      \
+        build/*.pstex   \
         build/*.pstex_t \
         build/*.tex     \