Ignore:
Timestamp:
Sep 21, 2018, 11:26:31 PM (6 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
3b1825b, fcc57ba
Parents:
031a88a9 (diff), 371ef1d (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 conflicit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/theses/aaron_moss_PhD/phd/Makefile

    r031a88a9 rec71a50  
    1 LATEX = pdflatex -interaction=nonstopmode
    2 BIBTEX = bibtex
     1BUILD = build
     2BIBDIR = ../../../bibliography
     3TEXLIB = .:${BUILD}:${BIBDIR}:
     4
     5LATEX = TEXINPUTS=${TEXLIB} && export TEXINPUTS && pdflatex -interaction= -output-directory=${BUILD}
     6BIBTEX = BIBINPUTS=${TEXLIB} && export BIBINPUTS && bibtex
    37
    48BASE = thesis
    59DOCUMENT = ${BASE}.pdf
    6 AUX = ${BASE}.aux ${BASE}.bbl ${BASE}.blg ${BASE}.log ${BASE}.out ${BASE}.toc
     10BIBFILE = ${BIBDIR}/pl.bib
    711
    812SOURCES = ${addsuffix .tex, \
     
    2327
    2428clean :
    25         @rm -frv ${DOCUMENT} ${AUX}
     29        @rm -fv ${BUILD}/*
    2630
    2731wc :
    2832        wc ${SOURCES}
    2933
    30 ${DOCUMENT} : ${SOURCES}
     34${DOCUMENT} : ${SOURCES} ${BUILD}
    3135        ${LATEX} ${BASE}
    3236        ${LATEX} ${BASE}
    3337
    34 rebuild-refs : ${SOURCES} aaron-thesis.bib
     38rebuild-refs : ${SOURCES} ${BIBFILE} ${BUILD}
    3539        ${LATEX} ${BASE}
    36         ${BIBTEX} ${BASE}
     40        ${BIBTEX} ${BUILD}/${BASE}
    3741        ${LATEX} ${BASE}
    3842        ${LATEX} ${BASE}
     43
     44${BUILD}:
     45        mkdir -p ${BUILD}
Note: See TracChangeset for help on using the changeset viewer.