Changeset 295e5071 for doc/papers

Timestamp:

Feb 1, 2018, 10:19:20 AM (5 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

aaron-thesis, arm-eh, 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:

0992849

Parents:

e2e7330 (diff), 23c27039 (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:/u/cforall/software/cfa/cfa-cc

Location:

doc/papers

Files:

• OOPSLA17/Makefile (modified) (3 diffs)
• concurrency/Makefile (modified) (2 diffs)
• general/Makefile (modified) (2 diffs)

doc/papers/OOPSLA17/Makefile

@@ -9 +9 @@
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures} evaluation
+VPATH = ${Build} ${Figures} evaluation
 
 ## Define the text source files.
@@ -36 +36 @@
 # Directives #
 
+.PHONY : all clean                                      # not file names
+
 all : ${DOCUMENT}
 
@@ -49 +51 @@
         dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex ../../bibliography/pl.bib
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ../../bibliography/pl.bib
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi

doc/papers/concurrency/Makefile

@@ -9 +9 @@
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures}
+VPATH = ${Build} ${Figures}
 
 ## Define the text source files.
@@ -58 +58 @@
         dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+${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

doc/papers/general/Makefile

@@ -9 +9 @@
 
 MAKEFLAGS = --no-print-directory --silent #
-VPATH = ${Figures} evaluation
+VPATH = ${Build} ${Figures} evaluation
 
 ## Define the text source files.
@@ -51 +51 @@
         dvips ${Build}/$< -o $@
 
-${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} ${basename ${DOCUMENT}}.tex \
+${basename ${DOCUMENT}}.dvi : Makefile ${Build} ${GRAPHS} ${PROGRAMS} ${PICTURES} ${FIGURES} ${SOURCES} \
                 ${Macros}/common.tex ${Macros}/indexstyle ../../bibliography/pl.bib
         # Must have *.aux file containing citations for bibtex