From c87758027ac6331ea3009bd55e717b5c235615ea Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Wed, 7 Oct 2009 23:50:01 -0700 Subject: [PATCH] Makefile: Tidy up the 'clean' target The doc Makefile should call Makefile.asciidoc's 'clean' target. Signed-off-by: David Aguilar --- Makefile | 8 +++----- share/doc/git-cola/Makefile | 3 ++- share/doc/git-cola/Makefile.asciidoc | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8c9d7949..e21370fc 100644 --- a/Makefile +++ b/Makefile @@ -63,12 +63,10 @@ clean: for dir in share/doc/git-cola test; do \ (cd $$dir && $(MAKE) clean); \ done - find cola -name '*.py[co]' -print0 | xargs -0 rm -f - find jsonpickle -name '*.py[co]' -print0 | xargs -0 rm -f + find . -name .noseids -print0 | xargs -0 rm -f + find . -name '*.py[co]' -print0 | xargs -0 rm -f find share -name '*.qm' -print0 | xargs -0 rm -f - find simplejson -name '*.py[co]' -print0 | xargs -0 rm -f - rm -rf build tmp - rm -f tags + rm -rf build tmp tags tags: ctags -R cola/*.py cola/views/*.py cola/controllers/*.py diff --git a/share/doc/git-cola/Makefile b/share/doc/git-cola/Makefile index 548aa453..985460c7 100644 --- a/share/doc/git-cola/Makefile +++ b/share/doc/git-cola/Makefile @@ -34,7 +34,8 @@ help: @echo " doctest to run all doctests embedded in the documentation (if enabled)" clean: - -rm -rf _build/* + -rm -rf conf.py _build/* + $(MAKE) -f Makefile.asciidoc clean conf.py: cp conf.py.in conf.py diff --git a/share/doc/git-cola/Makefile.asciidoc b/share/doc/git-cola/Makefile.asciidoc index a8b38bba..525ceeca 100644 --- a/share/doc/git-cola/Makefile.asciidoc +++ b/share/doc/git-cola/Makefile.asciidoc @@ -58,7 +58,7 @@ doc.dep : $(wildcard *.txt) build-docdep.perl -include doc.dep clean: - rm -f *.xml *.html *.pdf *.1 doc.dep + rm -f *.xml git-cola.html *.pdf *.1 doc.dep %.html : %.txt $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $< -- 2.11.4.GIT