Changeset 2a301ff for doc/theses/colby_parsons_MMAth/Makefile

Timestamp:

Aug 31, 2023, 11:31:15 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• doc/theses/colby_parsons_MMAth/Makefile (modified) (5 diffs)

doc/theses/colby_parsons_MMAth/Makefile

@@ -6 +6 @@
 TeXLIB = .:style:text:${Macros}:${Build}:../../bibliography:
 LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
-BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex -terse
+BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
 
 MAKEFLAGS = --no-print-directory --silent #
@@ -23 +23 @@
         text/channels \
         text/waituntil \
+        text/conclusion \
 }
 
@@ -67 +68 @@
 
 DATA =  data/pykeSendStatic \
-        data/pykeSendDynamic\
-        data/pykeExecutorMem\
-        data/nasusSendStatic\
-        data/nasusSendDynamic\
-        data/pykeExecutorMem\
+        data/pykeSendDynamic \
+        data/pykeExecutorMem \
+        data/nasusSendStatic \
+        data/nasusSendDynamic \
+        data/pykeExecutorMem \
+        data/nasus_Order \
+        data/pyke_Order \
 
 PICTURES = ${addsuffix .tikz, \
@@ -81 +84 @@
         diagrams/acyclic_swap \
         diagrams/cyclic_swap \
+        diagrams/steal \
+        diagrams/uCpp_select_tree \
 }
 
@@ -115 +120 @@
         # Must have *.aux file containing citations for bibtex
         if [ ! -r ${basename $@}.aux ] ; then ${LaTeX} ${basename $@}.tex ; fi
-        -${BibTeX} ${Build}/${basename $@}
+        ${BibTeX} ${Build}/${basename $@}
         # Some citations reference others so run again to resolve these citations
 #       ${LaTeX} ${basename $@}.tex