Use $(RM) in Makefiles instead of 'rm -f'
Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Emil Medve committed
Jul 14, 2007 at 12:51 UTC
4cb08df553e270ab516a140caeeddd8e94f1e497
5 files changed
+48
-43
Documentation/Makefile
+8
-7
@@ -41,6 +41,7 @@ ifdef ASCIIDOC8
41
ASCIIDOC_EXTRA += -a asciidoc7compatible
42
endif
43
INSTALL?=install
44
+RM ?= rm -f
45
DOC_REF = origin/man
46
47
-include ../config.mak.autogen
@@ -84,7 +85,7 @@ install: man
85
# Determine "include::" file references in asciidoc files.
86
#
87
doc.dep : $(wildcard *.txt) build-docdep.perl
87
- rm -f $@+ $@
88
+ $(RM) $@+ $@
89
perl ./build-docdep.perl >$@+
90
mv $@+ $@
91
@@ -109,11 +110,11 @@ cmd-list.made: cmd-list.perl $(MAN1_TXT)
110
git.7 git.html: git.txt core-intro.txt
111
112
clean:
112
- rm -f *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 howto-index.txt howto/*.html doc.dep
113
- rm -f $(cmds_txt) *.made
113
+ $(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 howto-index.txt howto/*.html doc.dep
114
+ $(RM) $(cmds_txt) *.made
115
116
%.html : %.txt
116
- rm -f $@+ $@
117
+ $(RM) $@+ $@
118
$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
119
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $<
120
mv $@+ $@
@@ -122,7 +123,7 @@ clean:
123
xmlto -m callouts.xsl man $<
124
125
%.xml : %.txt
125
- rm -f $@+ $@
126
+ $(RM) $@+ $@
127
$(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf \
128
$(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $<
129
mv $@+ $@
@@ -137,7 +138,7 @@ user-manual.html: user-manual.xml
138
xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
139
140
howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
140
- rm -f $@+ $@
141
+ $(RM) $@+ $@
142
sh ./howto-index.sh $(wildcard howto/*.txt) >$@+
143
mv $@+ $@
144
@@ -147,7 +148,7 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
148
WEBDOC_DEST = /pub/software/scm/git/docs
149
150
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
150
- rm -f $@+ $@
151
+ $(RM) $@+ $@
152
sed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+
153
mv $@+ $@
154
Makefile
+34
-33
@@ -176,6 +176,7 @@ export prefix bindir gitexecdir sharedir template_dir sysconfdir
176
177
CC = gcc
178
AR = ar
179
+RM = rm -f
180
TAR = tar
181
INSTALL = install
182
RPMBUILD = rpmbuild
@@ -729,7 +730,7 @@ export TAR INSTALL DESTDIR SHELL_PATH
730
731
all:: $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS)
732
ifneq (,$X)
732
- $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), rm -f '$p';)
733
+ $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$p';)
734
endif
735
736
all::
@@ -743,7 +744,7 @@ strip: $(PROGRAMS) git$X
744
$(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X
745
746
gitk-wish: gitk GIT-GUI-VARS
746
- $(QUIET_GEN)rm -f $@ $@+ && \
747
+ $(QUIET_GEN)$(RM) $@ $@+ && \
748
sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \
749
chmod +x $@+ && \
750
mv -f $@+ $@
@@ -759,10 +760,10 @@ git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
760
help.o: common-cmds.h
761
762
git-merge-subtree$X: git-merge-recursive$X
762
- $(QUIET_BUILT_IN)rm -f $@ && ln git-merge-recursive$X $@
763
+ $(QUIET_BUILT_IN)$(RM) $@ && ln git-merge-recursive$X $@
764
765
$(BUILT_INS): git$X
765
- $(QUIET_BUILT_IN)rm -f $@ && ln git$X $@
766
+ $(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@
767
768
common-cmds.h: ./generate-cmdlist.sh
769
@@ -770,7 +771,7 @@ common-cmds.h: $(wildcard Documentation/git-*.txt)
771
$(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@
772
773
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
773
- $(QUIET_GEN)rm -f $@ $@+ && \
774
+ $(QUIET_GEN)$(RM) $@ $@+ && \
775
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
776
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
777
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
@@ -782,7 +783,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
783
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
784
785
$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
785
- rm -f $@ $@+
786
+ $(RM) $@ $@+
787
sed -e '1s|#!.*/python|#!$(PYTHON_PATH_SQ)|' \
788
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
789
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
@@ -794,7 +795,7 @@ perl/perl.mak: GIT-CFLAGS
795
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
796
797
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
797
- $(QUIET_GEN)rm -f $@ $@+ && \
798
+ $(QUIET_GEN)$(RM) $@ $@+ && \
799
INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
800
sed -e '1{' \
801
-e ' s|#!.*perl|#!$(PERL_PATH_SQ)|' \
@@ -813,7 +814,7 @@ git-status: git-commit
814
$(QUIET_GEN)cp $< $@+ && mv $@+ $@
815
816
gitweb/gitweb.cgi: gitweb/gitweb.perl
816
- $(QUIET_GEN)rm -f $@ $@+ && \
817
+ $(QUIET_GEN)$(RM) $@ $@+ && \
818
sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|' \
819
-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
820
-e 's|++GIT_BINDIR++|$(bindir)|g' \
@@ -836,7 +837,7 @@ gitweb/gitweb.cgi: gitweb/gitweb.perl
837
mv $@+ $@
838
839
git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
839
- $(QUIET_GEN)rm -f $@ $@+ && \
840
+ $(QUIET_GEN)$(RM) $@ $@+ && \
841
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
842
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
843
-e 's/@@NO_CURL@@/$(NO_CURL)/g' \
@@ -849,11 +850,11 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
850
mv $@+ $@
851
852
configure: configure.ac
852
- $(QUIET_GEN)rm -f $@ $<+ && \
853
+ $(QUIET_GEN)$(RM) $@ $<+ && \
854
sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
855
$< > $<+ && \
856
autoconf -o $@ $<+ && \
856
- rm -f $<+
857
+ $(RM) $<+
858
859
# These can record GIT_VERSION
860
git.o git.spec \
@@ -908,7 +909,7 @@ $(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
909
$(DIFF_OBJS): diffcore.h
910
911
$(LIB_FILE): $(LIB_OBJS)
911
- $(QUIET_AR)rm -f $@ && $(AR) rcs $@ $(LIB_OBJS)
912
+ $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(LIB_OBJS)
913
914
XDIFF_OBJS=xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
915
xdiff/xmerge.o
@@ -916,7 +917,7 @@ $(XDIFF_OBJS): xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
917
xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
918
919
$(XDIFF_LIB): $(XDIFF_OBJS)
919
- $(QUIET_AR)rm -f $@ && $(AR) rcs $@ $(XDIFF_OBJS)
920
+ $(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
921
922
923
perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
@@ -927,11 +928,11 @@ doc:
928
$(MAKE) -C Documentation all
929
930
TAGS:
930
- rm -f TAGS
931
+ $(RM) TAGS
932
find . -name '*.[hcS]' -print | xargs etags -a
933
934
tags:
934
- rm -f tags
935
+ $(RM) tags
936
find . -name '*.[hcS]' -print | xargs ctags -a
937
938
### Detect prefix changes
@@ -1010,9 +1011,9 @@ endif
1011
cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
1012
'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
1013
fi
1013
- $(foreach p,$(BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
1014
+ $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
1015
ifneq (,$X)
1015
- $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
1016
+ $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
1017
endif
1018
1019
install-doc:
@@ -1042,7 +1043,7 @@ dist: git.spec git-archive configure
1043
$(GIT_TARNAME)/configure \
1044
$(GIT_TARNAME)/version \
1045
$(GIT_TARNAME)/git-gui/version
1045
- @rm -rf $(GIT_TARNAME)
1046
+ @$(RM) -r $(GIT_TARNAME)
1047
gzip -f -9 $(GIT_TARNAME).tar
1048
1049
rpm: dist
@@ -1051,13 +1052,13 @@ rpm: dist
1052
htmldocs = git-htmldocs-$(GIT_VERSION)
1053
manpages = git-manpages-$(GIT_VERSION)
1054
dist-doc:
1054
- rm -fr .doc-tmp-dir
1055
+ $(RM) -r .doc-tmp-dir
1056
mkdir .doc-tmp-dir
1057
$(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc
1058
cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar .
1059
gzip -n -9 -f $(htmldocs).tar
1060
:
1060
- rm -fr .doc-tmp-dir
1061
+ $(RM) -r .doc-tmp-dir
1062
mkdir -p .doc-tmp-dir/man1 .doc-tmp-dir/man5 .doc-tmp-dir/man7
1063
$(MAKE) -C Documentation DESTDIR=./ \
1064
man1dir=../.doc-tmp-dir/man1 \
@@ -1066,31 +1067,31 @@ dist-doc:
1067
install
1068
cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
1069
gzip -n -9 -f $(manpages).tar
1069
- rm -fr .doc-tmp-dir
1070
+ $(RM) -r .doc-tmp-dir
1071
1072
### Cleaning rules
1073
1074
clean:
1074
- rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
1075
+ $(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
1076
$(LIB_FILE) $(XDIFF_LIB)
1076
- rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
1077
- rm -f $(TEST_PROGRAMS)
1078
- rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
1079
- rm -rf autom4te.cache
1080
- rm -f configure config.log config.mak.autogen config.mak.append config.status config.cache
1081
- rm -rf $(GIT_TARNAME) .doc-tmp-dir
1082
- rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
1083
- rm -f $(htmldocs).tar.gz $(manpages).tar.gz
1084
- rm -f gitweb/gitweb.cgi
1077
+ $(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
1078
+ $(RM) $(TEST_PROGRAMS)
1079
+ $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
1080
+ $(RM) -r autom4te.cache
1081
+ $(RM) configure config.log config.mak.autogen config.mak.append config.status config.cache
1082
+ $(RM) -r $(GIT_TARNAME) .doc-tmp-dir
1083
+ $(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
1084
+ $(RM) $(htmldocs).tar.gz $(manpages).tar.gz
1085
+ $(RM) gitweb/gitweb.cgi
1086
$(MAKE) -C Documentation/ clean
1087
$(MAKE) -C perl clean
1088
$(MAKE) -C templates/ clean
1089
$(MAKE) -C t/ clean
1090
ifndef NO_TCLTK
1090
- rm -f gitk-wish
1091
+ $(RM) gitk-wish
1092
$(MAKE) -C git-gui clean
1093
endif
1093
- rm -f GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS
1094
+ $(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS
1095
1096
.PHONY: all install clean strip
1097
.PHONY: .FORCE-GIT-VERSION-FILE TAGS tags .FORCE-GIT-CFLAGS
contrib/emacs/Makefile
+2
-1
@@ -7,6 +7,7 @@ INSTALL ?= install
7
INSTALL_ELC = $(INSTALL) -m 644
8
prefix ?= $(HOME)
9
emacsdir = $(prefix)/share/emacs/site-lisp
10
+RM ?= rm -f
11
12
all: $(ELC)
13
@@ -17,4 +18,4 @@ install: all
18
%.elc: %.el
19
$(EMACS) -batch -f batch-byte-compile $<
20
20
-clean:; rm -f $(ELC)
21
+clean:; $(RM) $(ELC)
t/Makefile
+2
-1
@@ -6,6 +6,7 @@
6
#GIT_TEST_OPTS=--verbose --debug
7
SHELL_PATH ?= $(SHELL)
8
TAR ?= $(TAR)
9
+RM ?= rm -f
10
11
# Shell quote;
12
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@@ -19,7 +20,7 @@ $(T):
20
@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
21
22
clean:
22
- rm -fr trash
23
+ $(RM) -r trash
24
25
# we can test NO_OPTIMIZE_COMMITS independently of LC_ALL
26
full-svn-test:
templates/Makefile
+2
-1
@@ -6,6 +6,7 @@ endif
6
7
INSTALL ?= install
8
TAR ?= tar
9
+RM ?= rm -f
10
prefix ?= $(HOME)
11
template_dir ?= $(prefix)/share/git-core/templates
12
# DESTDIR=
@@ -42,7 +43,7 @@ custom:
43
$(QUIET): no custom templates yet
44
45
clean:
45
- rm -rf blt boilerplates.made
46
+ $(RM) -r blt boilerplates.made
47
48
install: all
49
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(template_dir_SQ)'