[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=efef7af

The following commit has been merged in the master branch:
commit efef7af34441dc7ddff8331c5a001ec2f7db84cd
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat May 2 15:06:15 2015 +0000

    Reworked clean Makefile targets a bit (so the test/tmp dir doesn't belong to root after sudo maintainer-clean)
---
 Makefile           | 5 ++---
 config/Makefile.in | 5 ++---
 test/Makefile      | 7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index e4f201d..7d381fb 100644
--- a/Makefile
+++ b/Makefile
@@ -113,18 +113,17 @@ mostlyclean clean: config/config.mk
 	cd src && $(MAKE) $(MAKECMDGOALS)
 	cd doc && $(MAKE) $(MAKECMDGOALS)
 	cd samples && $(MAKE) $(MAKECMDGOALS)
+	cd test && $(MAKE) $(MAKECMDGOALS)
 	cd xmpsdk/src && $(MAKE) $(MAKECMDGOALS)
 	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
 	cd po && $(MAKE) $(MAKECMDGOALS)
-	rm -rf test/tmp include/exiv2/exv_conf.h src/svn_version.h
-	mkdir  test/tmp
+	rm -f include/exiv2/exv_conf.h src/svn_version.h
 
 # `make distclean' also removes files created by configuring
 # the program. Running `make all distclean' prepares the project
 # for packaging.
 distclean: clean
 	rm -f config.log config.status libtool
-	rm -rf test/data/eps test/data/video
 	rm -f *~ *.bak
 	if [ -e bin ]; then rm -rf bin ; fi
 
diff --git a/config/Makefile.in b/config/Makefile.in
index 78536c1..0a28183 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -113,18 +113,17 @@ mostlyclean clean: config/config.mk
 	cd src && $(MAKE) $(MAKECMDGOALS)
 	cd doc && $(MAKE) $(MAKECMDGOALS)
 	cd samples && $(MAKE) $(MAKECMDGOALS)
+	cd test && $(MAKE) $(MAKECMDGOALS)
 	cd xmpsdk/src && $(MAKE) $(MAKECMDGOALS)
 	cd config && $(MAKE) -f config.make $(MAKECMDGOALS)
 	cd po && $(MAKE) $(MAKECMDGOALS)
-	rm -rf test/tmp include/exiv2/exv_conf.h src/svn_version.h
-	mkdir  test/tmp
+	rm -f include/exiv2/exv_conf.h src/svn_version.h
 
 # `make distclean' also removes files created by configuring
 # the program. Running `make all distclean' prepares the project
 # for packaging.
 distclean: clean
 	rm -f config.log config.status libtool
-	rm -rf test/data/eps test/data/video
 	rm -f *~ *.bak
 	if [ -e bin ]; then rm -rf bin ; fi
 
diff --git a/test/Makefile b/test/Makefile
index c57c825..7bf7724 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -54,7 +54,7 @@ SHELL = /bin/sh
 
 # ******************************************************************************
 # Targets
-.PHONY: all test testv teste clean distclean maintainer-clean
+.PHONY: all test testv teste mostlyclean clean distclean maintainer-clean
 
 ##
 # to save download time for simple build/test, we download video and eps data on demand
@@ -148,8 +148,8 @@ testx:
 	    ./$$p; \
 	done
 
-clean:
-	rm -rf $(top_srcdir)/test/tmp/* data/video data/eps
+mostlyclean clean:
+	rm -rf $(top_srcdir)/test/tmp/* 
 
 distclean: clean
 	$(RM) *~ *.bak *#
@@ -157,6 +157,7 @@ distclean: clean
 # This command is intended for maintainers to use; it deletes files
 # that may need special tools to rebuild.
 maintainer-clean: distclean
+	rm -rf $(top_srcdir)/data/video $(top_srcdir)/test/data/eps
 
 # That's all Folks!
 ##
\ No newline at end of file

-- 
exiv2 packaging