* [PATCH] Makefile: Add recipe to remove obsolete intermediate files
@ 2018-12-11 22:46 Akira Yokosawa
2018-12-12 11:27 ` [PATCH v2] " Akira Yokosawa
0 siblings, 1 reply; 3+ messages in thread
From: Akira Yokosawa @ 2018-12-11 22:46 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From 271e880a74f5b8467a26f550c9abc9ed1ff8378d Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
Date: Wed, 12 Dec 2018 07:35:24 +0900
Subject: [PATCH] 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. The old intermediate file
intro/PPGrelation.eps causes duplicated targets in the Makefile.
Therefore, add a list OBSOLETE_FILES in the Makefile and remove
such files by "make clean".
Also remove PPGrelation.eps from intro/.gitignore.
Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
---
Makefile | 3 ++-
intro/.gitignore | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index c928c80..49934df 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
ABBREVTARGETS := tcb 1c hb msns mss mstx msr msn msnt 1csf
@@ -293,7 +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 $(LATEXGENERATED) $(OBSOLETE_FILES)
rm -f extraction
rm -f CodeSamples/snippets.mk CodeSamples/snippets.d
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2] Makefile: Add recipe to remove obsolete intermediate files
2018-12-11 22:46 [PATCH] Makefile: Add recipe to remove obsolete intermediate files Akira Yokosawa
@ 2018-12-12 11:27 ` Akira Yokosawa
2018-12-12 18:45 ` Paul E. McKenney
0 siblings, 1 reply; 3+ messages in thread
From: Akira Yokosawa @ 2018-12-12 11:27 UTC (permalink / raw)
To: Paul E. McKenney; +Cc: perfbook, Akira Yokosawa
From 33b506548ce3b09cbf7a7e4e8bf1a80496dd9e1a Mon Sep 17 00:00:00 2001
From: Akira Yokosawa <akiyks@gmail.com>
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@gmail.com>
---
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
--
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] Makefile: Add recipe to remove obsolete intermediate files
2018-12-12 11:27 ` [PATCH v2] " Akira Yokosawa
@ 2018-12-12 18:45 ` Paul E. McKenney
0 siblings, 0 replies; 3+ messages in thread
From: Paul E. McKenney @ 2018-12-12 18:45 UTC (permalink / raw)
To: Akira Yokosawa; +Cc: perfbook
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@gmail.com>
> 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@gmail.com>
> ---
> 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
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-12 18:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-11 22:46 [PATCH] Makefile: Add recipe to remove obsolete intermediate files Akira Yokosawa
2018-12-12 11:27 ` [PATCH v2] " Akira Yokosawa
2018-12-12 18:45 ` Paul E. McKenney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox