Commit 36243179 authored by Paul Eggert's avatar Paul Eggert

Fix ‘make clean’ with a file named ‘-.o’

Problem reported by T.V Raman in:
https://lists.gnu.org/r/emacs-devel/2018-09/msg00866.html
* Makefile.in (clean, extraclean):
* doc/emacs/Makefile.in (mostlyclean):
* doc/lispintro/Makefile.in (mostlyclean):
* doc/lispref/Makefile.in (mostlyclean):
* doc/misc/Makefile.in (mostlyclean, clean):
* etc/refcards/Makefile (clean):
* lib-src/Makefile.in (mostlyclean, extraclean):
* lib/Makefile.in (clean):
* lwlib/Makefile.in (clean mostlyclean):
* oldXMenu/Makefile.in (clean mostlyclean):
* src/Makefile.in (mostlyclean, extraclean):
* test/Makefile.in (mostlyclean):
Say ‘rm ./*.o’ instead of ‘rm *.o’ to avoid undesirable failure
when a file name begins with ‘-’.
parent 662bee7d
...@@ -839,7 +839,7 @@ $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean))) ...@@ -839,7 +839,7 @@ $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean)))
clean: $(clean_dirs:=_clean) clean: $(clean_dirs:=_clean)
$(MAKE) -C admin/charsets $@ $(MAKE) -C admin/charsets $@
[ ! -d test ] || $(MAKE) -C test $@ [ ! -d test ] || $(MAKE) -C test $@
-rm -f *.tmp etc/*.tmp* -rm -f ./*.tmp etc/*.tmp*
-rm -rf info-dir.* -rm -rf info-dir.*
### 'bootclean' ### 'bootclean'
...@@ -926,7 +926,7 @@ $(foreach dir,$(extraclean_dirs),$(eval $(call submake_template,$(dir),extraclea ...@@ -926,7 +926,7 @@ $(foreach dir,$(extraclean_dirs),$(eval $(call submake_template,$(dir),extraclea
extraclean: $(extraclean_dirs:=_extraclean) extraclean: $(extraclean_dirs:=_extraclean)
${top_maintainer_clean} ${top_maintainer_clean}
-rm -f config-tmp-* -rm -f config-tmp-*
-rm -f *~ \#* -rm -f ./*~ \#*
# The src subdir knows how to do the right thing # The src subdir knows how to do the right thing
# even when the build directory and source dir are different. # even when the build directory and source dir are different.
......
...@@ -206,8 +206,8 @@ doc-emacsver: ...@@ -206,8 +206,8 @@ doc-emacsver:
## Temp files. ## Temp files.
mostlyclean: mostlyclean:
rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \ rm -f ./*.aux ./*.log ./*.toc ./*.cp ./*.cps ./*.fn ./*.fns ./*.ky ./*.kys \
*.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs ./*.op ./*.ops ./*.pg ./*.pgs ./*.tp ./*.tps ./*.vr ./*.vrs
## Products not in the release tarfiles. ## Products not in the release tarfiles.
clean: mostlyclean clean: mostlyclean
......
...@@ -109,8 +109,8 @@ emacs-lisp-intro.ps: emacs-lisp-intro.dvi ...@@ -109,8 +109,8 @@ emacs-lisp-intro.ps: emacs-lisp-intro.dvi
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean infoclean
mostlyclean: mostlyclean:
rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \ rm -f ./*.aux ./*.log ./*.toc ./*.cp ./*.cps ./*.fn ./*.fns ./*.ky ./*.kys \
*.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs ./*.op ./*.ops ./*.pg ./*.pgs ./*.tp ./*.tps ./*.vr ./*.vrs
clean: mostlyclean clean: mostlyclean
rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS) rm -f $(DVI_TARGETS) $(HTML_TARGETS) $(PDF_TARGETS) $(PS_TARGETS)
......
...@@ -167,8 +167,8 @@ elisp.ps: elisp.dvi ...@@ -167,8 +167,8 @@ elisp.ps: elisp.dvi
## [12] stuff is from two-volume.make. ## [12] stuff is from two-volume.make.
mostlyclean: mostlyclean:
rm -f *.aux *.log *.toc *.cp *.cps *.fn *.fns *.ky *.kys \ rm -f ./*.aux ./*.log ./*.toc ./*.cp ./*.cps ./*.fn ./*.fns ./*.ky ./*.kys \
*.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs ./*.op ./*.ops ./*.pg ./*.pgs ./*.tp ./*.tps ./*.vr ./*.vrs
rm -f elisp[12]* vol[12].tmp rm -f elisp[12]* vol[12].tmp
clean: mostlyclean clean: mostlyclean
......
...@@ -224,13 +224,13 @@ ${buildinfodir}/tramp.info tramp.html: ${srcdir}/trampver.texi ...@@ -224,13 +224,13 @@ ${buildinfodir}/tramp.info tramp.html: ${srcdir}/trampver.texi
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
mostlyclean: mostlyclean:
rm -f *.aux *.log *.toc *.c[mp] *.c[mp]s *.fn *.fns \ rm -f ./*.aux ./*.log ./*.toc ./*.c[mp] ./*.c[mp]s ./*.fn ./*.fns \
*.ky *.kys *.op *.ops *.p[gj] *.p[gj]s *.sc *.scs *.ss \ ./*.ky ./*.kys ./*.op ./*.ops ./*.p[gj] ./*.p[gj]s ./*.sc ./*.scs ./*.ss \
*.t[gp] *.t[gp]s *.vr *.vrs ./*.t[gp] ./*.t[gp]s ./*.vr ./*.vrs
rm -f gnustmp* rm -f gnustmp*
clean: mostlyclean clean: mostlyclean
rm -f *.dvi *.html *.pdf *.ps rm -f ./*.dvi ./*.html ./*.pdf ./*.ps
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile
......
...@@ -311,7 +311,7 @@ viperCard.dvi: $(vipercard_deps) ...@@ -311,7 +311,7 @@ viperCard.dvi: $(vipercard_deps)
.PHONY: clean .PHONY: clean
clean: clean:
-rm -f *.dvi *.log *.aux -rm -f ./*.dvi ./*.log ./*.aux
distclean: clean distclean: clean
......
...@@ -334,7 +334,7 @@ uninstall: ...@@ -334,7 +334,7 @@ uninstall:
fi fi
mostlyclean: mostlyclean:
rm -f core *.o *.res rm -f core ./*.o ./*.res
clean: mostlyclean clean: mostlyclean
rm -f ${EXE_FILES} rm -f ${EXE_FILES}
...@@ -345,7 +345,7 @@ distclean: clean ...@@ -345,7 +345,7 @@ distclean: clean
bootstrap-clean maintainer-clean: distclean bootstrap-clean maintainer-clean: distclean
extraclean: maintainer-clean extraclean: maintainer-clean
rm -f *~ \#* rm -f ./*~ \#*
## Test the contents of the directory. ## Test the contents of the directory.
check: check:
......
...@@ -118,7 +118,7 @@ TAGS: $(ETAGS) $(tagsfiles) ...@@ -118,7 +118,7 @@ TAGS: $(ETAGS) $(tagsfiles)
.PHONY: $(ETAGS) tags .PHONY: $(ETAGS) tags
clean: clean:
rm -f *.[ao] *-t \#* $(DEPDIR)/* rm -f ./*.[ao] ./*-t \#* $(DEPDIR)/*
mostlyclean: clean mostlyclean: clean
rm -f $(filter-out %-t,$(MOSTLYCLEANFILES)) rm -f $(filter-out %-t,$(MOSTLYCLEANFILES))
distclean bootstrap-clean: mostlyclean distclean bootstrap-clean: mostlyclean
......
...@@ -111,7 +111,7 @@ $(globals_h): ...@@ -111,7 +111,7 @@ $(globals_h):
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
clean mostlyclean: clean mostlyclean:
rm -f *.o liblw.a \#* $(DEPDIR)/* rm -f ./*.o liblw.a \#* $(DEPDIR)/*
distclean: clean distclean: clean
rm -f Makefile rm -f Makefile
......
...@@ -138,7 +138,7 @@ libXMenu11.a: $(OBJS) $(EXTRA) ...@@ -138,7 +138,7 @@ libXMenu11.a: $(OBJS) $(EXTRA)
.PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
clean mostlyclean: clean mostlyclean:
rm -f libXMenu11.a *.o $(DEPDIR)/* rm -f libXMenu11.a ./*.o $(DEPDIR)/*
bootstrap-clean maintainer-clean distclean: clean bootstrap-clean maintainer-clean distclean: clean
rm -f Makefile rm -f Makefile
......
...@@ -645,12 +645,12 @@ ns-app: emacs$(EXEEXT) ...@@ -645,12 +645,12 @@ ns-app: emacs$(EXEEXT)
.PHONY: versionclean extraclean .PHONY: versionclean extraclean
mostlyclean: mostlyclean:
rm -f temacs$(EXEEXT) core *.core \#* *.o rm -f temacs$(EXEEXT) core ./*.core \#* ./*.o
rm -f ../etc/DOC rm -f ../etc/DOC
rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT)
rm -f buildobj.h rm -f buildobj.h
rm -f globals.h gl-stamp rm -f globals.h gl-stamp
rm -f *.res *.tmp rm -f ./*.res ./*.tmp
clean: mostlyclean clean: mostlyclean
rm -f emacs-*.*.*[0-9]$(EXEEXT) emacs$(EXEEXT) $(DEPDIR)/* rm -f emacs-*.*.*[0-9]$(EXEEXT) emacs$(EXEEXT) $(DEPDIR)/*
...@@ -674,7 +674,7 @@ maintainer-clean: distclean ...@@ -674,7 +674,7 @@ maintainer-clean: distclean
versionclean: versionclean:
-rm -f emacs$(EXEEXT) emacs-*.*.*[0-9]$(EXEEXT) ../etc/DOC* -rm -f emacs$(EXEEXT) emacs-*.*.*[0-9]$(EXEEXT) ../etc/DOC*
extraclean: distclean extraclean: distclean
-rm -f *~ \#* -rm -f ./*~ \#*
ETAGS = ../lib-src/etags${EXEEXT} ETAGS = ../lib-src/etags${EXEEXT}
......
...@@ -307,7 +307,7 @@ endif ...@@ -307,7 +307,7 @@ endif
mostlyclean: mostlyclean:
-@for f in ${LOGFILES}; do test ! -f $$f || mv $$f $$f~; done -@for f in ${LOGFILES}; do test ! -f $$f || mv $$f $$f~; done
rm -f *.tmp rm -f ./*.tmp
clean: clean:
find . '(' -name '*.log' -o -name '*.log~' ')' $(FIND_DELETE) find . '(' -name '*.log' -o -name '*.log~' ')' $(FIND_DELETE)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment