update makefile

[asr1617.git] / Makefile

diff --git a/Makefile b/Makefile
index 15d03f8..f368d8e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,16 +15,23 @@ all: $(addsuffix .pdf,$(DOCS))
 %.fmt: %.pre
        $(LATEX) $(LATEXFLAGS) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump"
 
-%.pdf: %.mlog
-       if $(GREP) -iFq 'Rerun' $<; then $(LATEX) $(LATEXFLAGS) $(basename $<); fi
-
-%.mlog: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex)
+%.pdf: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex)
        $(LATEX) $(LATEXFLAGS) $<
        if $(GREP) -q '^\\bibdata{' $(basename $<).aux; then $(BIBTEX) $(BIBTEXFLAGS) $(basename $<); fi
        if $(GREP) -q '\@istfilename' $(basename $<).aux; then $(MAKEGLOSSARIES) $(MAKEGLOSSARIESFLAGSFLAGS) $(basename $<); fi
-       $(LATEX) $(LATEXFLAGS) $< | tee $@
+       $(LATEX) $(LATEXFLAGS) $< | pee cat "$(GREP) -iFq 'Rerun'"\
+               && $(LATEX) $(LATEXFLAGS) $< | pee cat "$(GREP) -iFq 'Rerun'"\
+               && $(LATEX) $(LATEXFLAGS) $< | pee cat "$(GREP) -iFq 'Rerun'"\
+               && $(LATEX) $(LATEXFLAGS) $< | pee cat "$(GREP) -iFq 'Rerun'"\
+               || true
+
+clean: $(addprefix clean-,$(DOCS))
+
+clobber: $(addprefix clobber-,$(DOCS))
+
+clean-%:
+       $(RM) $(addprefix $(@:clean-%=%).,acn acr alg aux bbl blg fmt glg glo gls\
+               ist lof log lol lot nav out run.xml snm tdo toc vrb xdy)
 
-clean:
-       $(RM) $(foreach DOC,$(DOCS),$(addprefix $(DOC).,\
-               acn acr alg aux bbl blg fmt glg glo gls ist lof log lol lot nav out\
-               pdf run.xml snm tdo toc vrb xdy))
+clobber-%:
+       $(RM) $(@:clobber-%=%).pdf