Changeset a1e67dd for doc/proposals/concurrency/Makefile

Timestamp:

Oct 26, 2016, 11:03:01 AM (9 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:

77971f6

Parents:

f0121d7 (diff), fe7b281 (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 tuples

Conflicts:

src/Parser/parser.cc
src/Parser/parser.yy

File:

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

doc/proposals/concurrency/Makefile

@@ -12 +12 @@
 
 FIGURES = ${addsuffix .tex, \
+        monitor \
+        ext_monitor \
 }
 
@@ -32 +34 @@
 
 clean :
-        rm -f *.bbl *.aux *.dvi *.idx *.ilg *.ind *.brf *.out *.log *.toc *.blg *.pstex_t *.cf *.glg *.glo *.gls *.ist \
+        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}
 
@@ -58 +60 @@
         # Run again to get index title into table of contents
         ${LaTeX} ${basename $@}.tex
+        -./bump_ver.sh
         ${LaTeX} ${basename $@}.tex
 
@@ -76 +79 @@
         fig2dev -L pstex_t -p $@ $< > $@_t
 
+
 # Local Variables: #
 # compile-command: "make" #