[PATCH v3] Tidy up 'clean' make target



Previously 'make clean' would not remove the following files:
- bin/meld.install
- meld/paths.py.install

While we're at it, simplify the removal process by using 'find' instead
of hardcoding paths.

Signed-off-by: Peter Tyser <ptyser gmail com>
---
Changes since v1:
- Change find rule *pyc/*install to *.pyc/*.install based on Vincent's
  comments
Changes since v2:
- Limit find path to ./meld (*.pyc, *.install) and ./bin (*.install)

Feel free to modify as you see fit if you'd prefer a different method.

 GNUmakefile |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 90b500b..dc0a2c3 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -29,7 +29,10 @@ all: $(addsuffix .install,$(SPECIALS)) meld.desktop
 
 .PHONY:clean
 clean: 
-	-rm -f meld/*.pyc meld/ui/*.pyc meld/util/*.pyc meld/vc/*.pyc *.install data/meld.desktop *.bak data/ui/*.bak
+	@find ./meld -type f \( -name '*.pyc' -o -name '*.install' \) -print0 |\
+		xargs -0 rm -f
+	@find ./bin -type f \( -name '*.install' \) -print0 | xargs -0 rm -f
+	@rm -f data/meld.desktop
 	$(MAKE) -C po clean
 	$(MAKE) -C help clean
 
-- 
1.6.2-rc2.GIT



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]