On Wed, Dec 12, 2018 at 08:27:15PM +0900, Akira Yokosawa wrote:
> >From 33b506548ce3b09cbf7a7e4e8bf1a80496dd9e1a Mon Sep 17 00:00:00 2001
> From: Akira Yokosawa <akiyks@xxxxxxxxx>
> Date: Wed, 12 Dec 2018 20:11:21 +0900
> Subject: [PATCH v2] Makefile: Add recipe to remove obsolete intermediate files
>
> Commit 3ab5541f7404 ("intro: Add containers and hypervisor to
> "iron triangle" diagram") replaced intro/PPGrelation.fig with
> intro/PPGrelation.svg. Left-over intermediate file
> intro/PPGrelation.eps causes duplicated targets in the Makefile.
>
> Therefore, add a list OBSOLETE_FILES in the Makefile and exclude
> such files from EPSSOURCES.
>
> Add "extraction" to the list since it was once an empty target
> and obsolete now.
>
> "make clean" will remove those files.
>
> Also remove PPGrelation.eps from intro/.gitignore.
>
> Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx>
> ---
> Hi Paul,
>
> This is an improved update.
>
> v1 -> v2:
>
> o To prevent warning of "make" even if the obsolete .eps file
> exists, exclude OBSOLETE_FILES from EPSSOURCES.
>
> o "extraction" is also obsolete, so add it to OBSOLETE_FILES.
>
> Thanks, Akira
Queued and pushed, and it did get rid of my intro/PPGrelation.eps. ;-)
Thank you!
Thanx, Paul
> --
> Makefile | 6 +++---
> intro/.gitignore | 1 -
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index c928c80..79ccd99 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -12,6 +12,7 @@ LATEXSOURCES = \
> */*/*.tex
>
> LATEXGENERATED = autodate.tex qqz.tex contrib.tex origpub.tex
> +OBSOLETE_FILES = intro/PPGrelation.eps extraction
>
> ABBREVTARGETS := tcb 1c hb msns mss mstx msr msn msnt 1csf
>
> @@ -38,7 +39,7 @@ EPSSOURCES_DUP := \
> $(EPSSOURCES_FROM_DOT) \
> $(EPSSOURCES_FROM_FIG)
>
> -EPSSOURCES := $(sort $(EPSSOURCES_DUP))
> +EPSSOURCES := $(sort $(filter-out $(OBSOLETE_FILES),$(EPSSOURCES_DUP)))
>
> PDFTARGETS_OF_EPS := $(EPSSOURCES:%.eps=%.pdf)
>
> @@ -293,8 +294,7 @@ clean:
> -o -name '*.qqz' -o -name '*.toc' -o -name '*.bbl' \
> -o -name '*.fcv' -o -name '*.ltms' | xargs rm -f
> rm -f perfbook_flat.tex perfbook*.out perfbook-*.tex
> - rm -f $(LATEXGENERATED)
> - rm -f extraction
> + rm -f $(LATEXGENERATED) $(OBSOLETE_FILES)
> rm -f CodeSamples/snippets.mk CodeSamples/snippets.d
>
> distclean: clean
> diff --git a/intro/.gitignore b/intro/.gitignore
> index c29b706..cffadec 100644
> --- a/intro/.gitignore
> +++ b/intro/.gitignore
> @@ -1,4 +1,3 @@
> FourTaskCategories.eps
> FourTaskOrder.eps
> Generality.eps
> -PPGrelation.eps
> --
> 2.7.4
>
>
