[PATCH 1/3] build: don't overwrite DISTCLEAN in performance-test

[PATCH 1/3] build: don't overwrite DISTCLEAN in performance-test

[David Bremner]

This might have worked once for some fixed order of including
makefiles, but it is clearly wrong now.
---
 performance-test/Makefile.local | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index d97e56d..cbea2d3 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -40,4 +40,4 @@ download-corpus:
 	wget -O ${TXZFILE} ${DEFAULT_URL}
 
 CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.*
-DISTCLEAN := $(dir)/corpus $(dir)/notmuch.cache.*
+DISTCLEAN := $(DISTCLEAN) $(dir)/corpus $(dir)/notmuch.cache.*
-- 
1.9.2

[PATCH 2/3] build: remove .tar.gz.tmp files in clean

[David Bremner]

Most people won't see these, but they annoy anyone running release
or pre-release targets.
---
 Makefile.local | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.local b/Makefile.local
index fa07d81..b46917b 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -330,7 +330,8 @@ install-desktop:
 	desktop-file-install --mode 0644 --dir "$(DESTDIR)$(desktop_dir)" notmuch.desktop
 
 SRCS  := $(SRCS) $(notmuch_client_srcs)
-CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules) version.stamp
+CLEAN := $(CLEAN) notmuch notmuch-shared $(notmuch_client_modules)
+CLEAN := $(CLEAN) version.stamp notmuch-*.tar.gz.tmp
 
 DISTCLEAN := $(DISTCLEAN) .first-build-message Makefile.config
 
-- 
1.9.2

[PATCH 3/3] build: add dataclean

[David Bremner]

It turns out to be inconvenient to delete the downloaded datafiles with
distclean, so I propose a new target which does that instead.

The closest conventional target is 'maintainer-clean'; the difference
here is that having the original source tarball is not enough to
reconstruct these files.
---
 Makefile.local                     | 4 ++++
 performance-test/Makefile.local    | 1 +
 test/test-databases/Makefile.local | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile.local b/Makefile.local
index b46917b..97b582d 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -261,6 +261,10 @@ clean:
 distclean: clean
 	rm -rf $(DISTCLEAN)
 
+.PHONY: dataclean
+dataclean: distclean
+	rm -rf $(DATACLEAN)
+
 notmuch_client_srcs =		\
 	command-line-arguments.c\
 	debugger.c		\
diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
index cbea2d3..3469aa3 100644
--- a/performance-test/Makefile.local
+++ b/performance-test/Makefile.local
@@ -41,3 +41,4 @@ download-corpus:
 
 CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.*
 DISTCLEAN := $(DISTCLEAN) $(dir)/corpus $(dir)/notmuch.cache.*
+DATACLEAN := $(DATACLEAN) $(TXZFILE)
diff --git a/test/test-databases/Makefile.local b/test/test-databases/Makefile.local
index 0572e78..ff333a1 100644
--- a/test/test-databases/Makefile.local
+++ b/test/test-databases/Makefile.local
@@ -11,4 +11,4 @@ test_databases := $(dir)/database-v1.tar.xz
 
 download-test-databases: ${test_databases}
 
-DISTCLEAN := $(DISTCLEAN) ${test_databases}
+DATACLEAN := $(DATACLEAN) ${test_databases}
-- 
1.9.2

Re: [PATCH 1/3] build: don't overwrite DISTCLEAN in performance-test

[Tomi Ollila]

On Sun, May 04 2014, David Bremner wrote:

> This might have worked once for some fixed order of including
> makefiles, but it is clearly wrong now.
> ---

Series LGTM.

Tomi


>  performance-test/Makefile.local | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
> index d97e56d..cbea2d3 100644
> --- a/performance-test/Makefile.local
> +++ b/performance-test/Makefile.local
> @@ -40,4 +40,4 @@ download-corpus:
>  	wget -O ${TXZFILE} ${DEFAULT_URL}
>  
>  CLEAN := $(CLEAN) $(dir)/tmp.* $(dir)/log.*
> -DISTCLEAN := $(dir)/corpus $(dir)/notmuch.cache.*
> +DISTCLEAN := $(DISTCLEAN) $(dir)/corpus $(dir)/notmuch.cache.*
> -- 
> 1.9.2
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH 1/3] build: don't overwrite DISTCLEAN in performance-test

[David Bremner]

David Bremner <david@tethera.net> writes:

> This might have worked once for some fixed order of including
> makefiles, but it is clearly wrong now.

series pushed to master

d