[PATCH RT-TESTS 0/3] A few Makefile clean-ups

[PATCH RT-TESTS 0/3] A few Makefile clean-ups

[John Kacur]

From: John Kacur <jkacur@redhat.com>

I have few simple build clean-ups, which should be uncontroversial
for the rt-tests suite

John Kacur (3):
  Makefile: Don't tag tmp files created when making a release
  Makefile: Add tmp dir to distclean and "make release" call distclean
  Makefile: Add BUILDROOT and SPECS to the dirs to remove for distclean

 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

-- 
1.7.11.7

[PATCH RT-TESTS 1/3] Makefile: Don't tag tmp files created when making a release

[John Kacur]

From: John Kacur <jkacur@redhat.com>

Don't tag the copies of the source files placed in the tmp directory
during the creation of a release.
Without this change tags finds both copies, eg: for tag cyclictest.c
  # pri kind tag               file
  1 F C F    cyclictest.c      src/cyclictest/cyclictest.c
               1
  2 F   F    cyclictest.c      tmp/rt-tests/src/cyclictest/cyclictest.c
               1

With this change only the first one is found.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index fd3cdb3..3b637c5 100644
--- a/Makefile
+++ b/Makefile
@@ -192,4 +192,4 @@ help:
 
 .PHONY: tags
 tags:
-	ctags -R --extra=+f --c-kinds=+p *
+	ctags -R --extra=+f --c-kinds=+p --exclude=tmp *
-- 
1.7.11.7

[PATCH RT-TESTS 2/3] Makefile: Add tmp dir to distclean and "make release" call distclean

[John Kacur]

From: John Kacur <jkacur@redhat.com>

The files in the tmp dir are generated during make release.
These are the kind of generated files that should be removed for distclean,
So add tmp. make release can be slightly simplified by then depending
on distclean instead of clean.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3b637c5..ecc7386 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf BUILD RPMS SRPMS releases *.tar.gz rt-tests.spec
+	rm -rf BUILD RPMS SRPMS releases *.tar.gz rt-tests.spec tmp
 
 .PHONY: changelog
 changelog:
@@ -143,9 +143,9 @@ install: all
 	gzip src/hackbench/hackbench.8 -c >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
 
 .PHONY: release
-release: clean changelog
+release: distclean changelog
 	mkdir -p releases
-	rm -rf tmp && mkdir -p tmp/rt-tests
+	mkdir -p tmp/rt-tests
 	cp -r Makefile COPYING ChangeLog src tmp/rt-tests
 	tar -C tmp -czf rt-tests-$(VERSION_STRING).tar.gz rt-tests
 	rm -f ChangeLog
-- 
1.7.11.7

[PATCH RT-TESTS 3/3] Makefile: Add BUILDROOT and SPECS to the dirs to remove for distclean

[John Kacur]

From: John Kacur <jkacur@redhat.com>

make rpm creates the dirs BUILDROOT and SPECS that are missed by distclean.
Gather all rpm related DIRS to the RPMDIRS and add that to distclean.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ecc7386..25cfbfb 100644
--- a/Makefile
+++ b/Makefile
@@ -111,9 +111,10 @@ clean:
 	rm -f hwlatdetect
 	rm -f tags
 
+RPMDIRS = BUILD BUILDROOT RPMS SRPMS SPECS
 .PHONY: distclean
 distclean: clean
-	rm -rf BUILD RPMS SRPMS releases *.tar.gz rt-tests.spec tmp
+	rm -rf $(RPMDIRS) releases *.tar.gz rt-tests.spec tmp
 
 .PHONY: changelog
 changelog:
-- 
1.7.11.7

Re: [PATCH RT-TESTS 0/3] A few Makefile clean-ups

[Frank Rowand]

On 02/08/13 06:47, John Kacur wrote:
> From: John Kacur <jkacur@redhat.com>
> 
> I have few simple build clean-ups, which should be uncontroversial
> for the rt-tests suite
> 
> John Kacur (3):
>   Makefile: Don't tag tmp files created when making a release
>   Makefile: Add tmp dir to distclean and "make release" call distclean
>   Makefile: Add BUILDROOT and SPECS to the dirs to remove for distclean
> 
>  Makefile | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 


All three patches:

  Reviewed-by: Frank Rowand <frank.rowand@am.sony.com>
  Tested-by: Frank Rowand <frank.rowand@am.sony.com>

With the caveat that "make rpm" does not complete on my build system
due to a missing numactl-devel dependency.

Even without "make rpm" completing, it creates the extra objects
that patch 3 removes, so I think my testing is still valid.

-Frank