mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 14:27:54 +01:00
Code Activity

contrib/subtree/Makefile: clean up rule for "clean"

Browse source 
git:Documentation/Makefile and others establish "RM ?= rm -f" as a
convention for rm calls in clean rules, hence follow this convention
instead of simply forcing clean to use rm.

subproj and mainline no longer need to be removed in clean, as they are
no longer created in git:contrib/subtree by "make test". Hence, remove
the rm call for those folders.

Other makefiles don't remove "*~" files, remove the rm call to prevent
unexpected behaviour in the future. Similarly, clean doesn't remove the
installable file, so rectify this.

Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: James Denholm <nod.helm@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
James Denholm 2014-05-06 22:41:49 +10:00 committed by Junio C Hamano
parent c7abbb9863
commit 602efc4f90
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/subtree/Makefile
View file

@ -12,7 +12,8 @@ man1dir ?= $(mandir)/man1
-include ../../GIT-VERSION-FILE
# this should be set to a 'standard' bsd-type install program
INSTALL ?= install
INSTALL ?= install
RM ?= rm -f
ASCIIDOC = asciidoc
XMLTO = xmlto
@ -60,7 +61,7 @@ test:
$(MAKE) -C t/ test
clean:
rm -f *~ *.xml *.html *.1
rm -rf subproj mainline
$(RM) $(GIT_SUBTREE)
$(RM) *.xml *.html *.1
.PHONY: FORCE