[sheepdog] [PATCH] makefile: remove .orig .rej file

Liu Yuan namei.unix at gmail.com
Sat May 19 16:48:41 CEST 2012


From: Liu Yuan <tailai.ly at taobao.com>

Old script doesn't work well with the subdir such as a sheep/farm/*.orig, so
use 'find' to find the all the files.

Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
 Makefile.am        |    3 ++-
 collie/Makefile.am |    2 +-
 sheep/Makefile.am  |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 25a50f3..2c9bcc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,8 @@ dist-clean-local:
 	rm -f autoconf automake autoheader
 
 clean-generic:
-	rm -rf $(SPEC) $(TARFILE) cscope* *.orig *.rej
+	rm -rf $(SPEC) $(TARFILE) cscope*
+	find -name '*.orig' -or -name '*.rej' | xargs rm
 
 cscope:
 	@echo create cscope.out
diff --git a/collie/Makefile.am b/collie/Makefile.am
index 695e2cd..d98b709 100644
--- a/collie/Makefile.am
+++ b/collie/Makefile.am
@@ -44,7 +44,7 @@ all-local:
 	@echo Built collie
 
 clean-local:
-	rm -f collie *.o gmon.out *.da *.bb *.bbg *.orig *.rej
+	rm -f collie *.o gmon.out *.da *.bb *.bbg
 
 # support for GNU Flymake
 check-syntax:
diff --git a/sheep/Makefile.am b/sheep/Makefile.am
index 4ddf48d..7448ae1 100644
--- a/sheep/Makefile.am
+++ b/sheep/Makefile.am
@@ -62,7 +62,7 @@ all-local:
 	@echo Built sheep
 
 clean-local:
-	rm -f sheep *.o gmon.out *.da *.bb *.bbg *.orig *.rej
+	rm -f sheep *.o gmon.out *.da *.bb *.bbg
 
 # support for GNU Flymake
 check-syntax:
-- 
1.7.10.2




More information about the sheepdog mailing list