Ignore:
Timestamp:
Sep 19, 2022, 8:11:02 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, ast-experimental, master, pthread-emulation, stuck-waitfor-destruct
Children:
aa9f215
Parents:
ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/theses/thierry_delisle_PhD/thesis/Makefile

    rebf8ca5 r23a08aa0  
    1111LaTeX  = TEXINPUTS=${TeXLIB} && export TEXINPUTS && latex -halt-on-error -output-directory=${Build}
    1212BibTeX = BIBINPUTS=${TeXLIB} && export BIBINPUTS && bibtex
     13DeTeX = TEXINPUTS=${TeXLIB} && export TEXINPUTS && detex -r
    1314
    1415MAKEFLAGS = --no-print-directory # --silent
     
    144145        ${LaTeX} $<
    145146
     147%.tty: build/%.dvi
     148        dvi2tty -w132 $< > $@
     149
    146150## Define the default recipes.
    147151
     
    190194churn_jax_ops_FLAGS = --MaxY=50000000
    191195churn_low_jax_ops_FLAGS = --MaxY=50000000
    192 churn_jax_ns_FLAGS = --MaxY=20000
    193 churn_low_jax_ns_FLAGS = --MaxY=20000
     196churn_jax_ns_FLAGS = --MaxY=10000
     197churn_low_jax_ns_FLAGS = --MaxY=10000
    194198
    195199churn_nasus_ops_FLAGS = --MaxY=75000000
    196200churn_low_nasus_ops_FLAGS = --MaxY=75000000
    197 churn_nasus_ns_FLAGS = --MaxY=20000
    198 churn_low_nasus_ns_FLAGS = --MaxY=20000
     201churn_nasus_ns_FLAGS = --MaxY=5000
     202churn_low_nasus_ns_FLAGS = --MaxY=5000
     203
     204locality_share_jax_ops_FLAGS = --MaxY=40000000
     205locality_noshare_jax_ops_FLAGS = --MaxY=40000000
     206locality_share_jax_ns_FLAGS = --MaxY=10000
     207locality_noshare_jax_ns_FLAGS = --MaxY=10000
     208
     209locality_share_nasus_ops_FLAGS = --MaxY=60000000
     210locality_noshare_nasus_ops_FLAGS = --MaxY=60000000
     211locality_share_nasus_ns_FLAGS = --MaxY=10000
     212locality_noshare_nasus_ns_FLAGS = --MaxY=10000
    199213
    200214build/result.%.ns.svg : data/% Makefile ../../../../benchmark/plot.py | ${Build}
Note: See TracChangeset for help on using the changeset viewer.