From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 13 Apr 2017 11:30:31 +0000 (+0200)
Subject: update makefile
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=0a63d3ae11d8638b9d52a4a42e5a8517798c1d2a;p=asr1617.git

update makefile
---

diff --git a/Makefile b/Makefile
index 15d03f8..f368d8e 100644
--- 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
diff --git a/asr.tex b/asr.tex
index 2c557de..40c6e52 100644
--- a/asr.tex
+++ b/asr.tex
@@ -145,10 +145,12 @@ When the waveforms are finished they are converted to \glspl{MFCC} vectors
 using the \emph{python\_speech\_features}%
 ~\footnote{\url{https://github.com/jameslyons/python_speech_features}} package.
 All these steps combined results in thirteen tab separated features per line in
-a file for every source file. Every file is annotated using
+a file for every source file. Technical info about the processing steps is
+given in the following sections. Every file is annotated using
 Praat~\cite{boersma_praat_2002} where the utterances are manually aligned to
 the audio. Examples of utterances are shown in
-Figures~\ref{fig:bloodstained,fig:abominations}. It is clearly visible that
+Figures~\ref{fig:bloodstained,fig:abominations} where the waveform, $1-8000$Hz
+spectrals and annotations are shown. It is clearly visible that
 within the genre of death metal there are a different spectral patterns
 visible.