NOTE: This patch has been committed. ChangeLog addition: 2005-11-22 Ben Wing <ben(a)xemacs.org&gt; * dynodump/Makefile.in.in (mostlyclean): Ignore errors from rm during clean. 2005-11-22 Ben Wing <ben(a)xemacs.org&gt; * Makefile.in.in (top-mostlyclean): * Makefile.in.in (top-clean): * Makefile.in.in (top-distclean-noconfig): * Makefile.in.in (top-distclean): * Makefile.in.in (top-realclean-noconfig): * Makefile.in.in (top-extraclean-noconfig): * Makefile.in.in (TAGS tags): Ignore errors from rm during clean, to prevent problems trying to remove lock/CVS. src/ChangeLog addition: 2005-11-22 Ben Wing <ben(a)xemacs.org&gt; * Makefile.in.in (mostlyclean): Ignore errors from rm during clean. lib-src/ChangeLog addition: 2005-11-22 Ben Wing <ben(a)xemacs.org&gt; * Makefile.in.in: Ignore errors from rm during clean. lwlib/ChangeLog addition: 2005-11-22 Ben Wing <ben(a)xemacs.org&gt; * Makefile.in.in: Ignore errors from rm during clean. netinstall/ChangeLog addition: 2005-11-22 Ben Wing <ben(a)xemacs.org&gt; * Makefile.in.in: Ignore errors from rm during clean. modules/ChangeLog addition: 2005-11-22 Ben Wing <ben(a)xemacs.org&gt; * common/Makefile.common (mostlyclean): Ignore errors from rm during clean. build source patch: Diff command: bash -ci "cvs-diff --show-c-function -no-changelog " Files affected: modules/common/Makefile.common netinstall/Makefile.in.in dynodump/Makefile.in.in lwlib/Makefile.in.in lib-src/Makefile.in.in src/Makefile.in.in Makefile.in.in Index: Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v retrieving revision 1.27 diff -u -p -r1.27 Makefile.in.in --- Makefile.in.in 2005/11/13 10:39:39 1.27 +++ Makefile.in.in 2005/11/22 06:25:20 ＠＠ -531,7 +531,7 ＠＠ FRC.distclean-noconfig FRC.realclean-noc ## target for GCC does not delete `libgcc.a', because recompiling it ## is rarely necessary and takes a lot of time. top-mostlyclean: FRC.mostlyclean - $(RM) core + -$(RM) core mostlyclean: top-mostlyclean for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done ＠＠ -549,9 +549,9 ＠＠ mostlyclean: top-mostlyclean ## when they don't work right. (beta can't depend on distclean, which ## removes necessary files generated by configure.) top-clean: FRC.clean - $(RM) core lisp/auto-autoloads.el* lisp/custom-load.el* - $(RM) lisp/mule/auto-autoloads.el* lisp/mule/custom-load.el* - $(RM) modules/auto-autoloads.el* modules/custom-load.el* + -$(RM) core lisp/auto-autoloads.el* lisp/custom-load.el* + -$(RM) lisp/mule/auto-autoloads.el* lisp/mule/custom-load.el* + -$(RM) modules/auto-autoloads.el* modules/custom-load.el* clean: top-mostlyclean top-clean for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done ＠＠ -559,8 +559,8 ＠＠ clean: top-mostlyclean top-clean ## `distclean-noconfig' ## Like `distclean' but don't delete files created by `configure'. top-distclean-noconfig: FRC.distclean-noconfig - $(RM) TAGS .sbinit lock/* lisp/finder-inf.el* - $(RM) -r site-packages xemacs-packages mule-packages site-lisp + -$(RM) TAGS .sbinit lock/* lisp/finder-inf.el* + -$(RM) -r site-packages xemacs-packages mule-packages site-lisp distclean-noconfig: top-mostlyclean top-clean top-distclean-noconfig for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done ＠＠ -572,9 +572,9 ＠＠ distclean-noconfig: top-mostlyclean top- ## `make distclean' should leave only the files that were in the ## distribution. top-distclean: FRC.distclean - $(RM) config.status config.log confdefs.h config-tmp-* build-install Installation - $(RM) GNUmakefile Makefile Makefile.in - $(RM) Installation.el Installation.elc + -$(RM) config.status config.log confdefs.h config-tmp-* build-install Installation + -$(RM) GNUmakefile Makefile Makefile.in + -$(RM) Installation.el Installation.elc distclean: top-mostlyclean top-clean top-distclean-noconfig top-distclean for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done ＠＠ -583,7 +583,7 ＠＠ distclean: top-mostlyclean top-clean top ## Delete everything that can be reconstructed by `make'. Don't delete ## anything requiring reconfiguration. top-realclean-noconfig: FRC.realclean-noconfig - $(RM) *.elc lisp/*.elc lisp/mule/*.elc lisp/term/*.elc modules/*.elc + -$(RM) *.elc lisp/*.elc lisp/mule/*.elc lisp/term/*.elc modules/*.elc realclean-noconfig: top-mostlyclean top-clean top-distclean-noconfig top-realclean-noconfig for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done ＠＠ -609,7 +609,7 ＠＠ realclean: top-mostlyclean top-clean top ## `extraclean-noconfig' ## Like `extraclean' but don't delete anything requiring reconfiguration. top-extraclean-noconfig: FRC.extraclean-noconfig - $(RM) *~ \#* + -$(RM) *~ \#* extraclean-noconfig: top-mostlyclean top-clean top-distclean-noconfig top-realclean-noconfig top-extraclean-noconfig for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $＠); done ＠＠ -658,7 +658,7 ＠＠ PRUNE_VC = -name SCCS -prune -o -name RC tagslisp = lisp TAGS tags: FRC.tags ＠echo "If you don't have a copy of etags around, then do 'make lib-src' first." - $(RM) ${srcdir}/TAGS + -$(RM) ${srcdir}/TAGS ＠PATH=`$(pwd)`/lib-src:$$PATH HOME=/-=-; export PATH HOME; \ echo "Using etags from `which etags`." PATH=`$(pwd)`/lib-src:$$PATH ; export PATH; cd ${srcdir} && \ Index: src/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v retrieving revision 1.120 diff -u -p -r1.120 Makefile.in.in --- src/Makefile.in.in 2005/11/13 10:39:36 1.120 +++ src/Makefile.in.in 2005/11/22 06:25:25 ＠＠ -1007,33 +1007,33 ＠＠ covmacs: $(temacs_deps) .PHONY: mostlyclean clean distclean realclean versionclean extraclean .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig mostlyclean: - $(RM) *.o *.i *.rtl *.ln core \ + -$(RM) *.o *.i *.rtl *.ln core \ temacs puremacs quantmacs covmacs rtcmacs temacs.exe \ sheap-adjust.h dump-id.c $(BLDSRC)/NEEDTODUMP SATISFIED \ $(LIB_SRC)/*.po $(LIB_SRC)/*.mo versionclean: - $(RM) $(RAW_EXE) $(DUMP_TARGET) $(LIB_SRC)/DOC + -$(RM) $(RAW_EXE) $(DUMP_TARGET) $(LIB_SRC)/DOC ## Remove the generated load files here; they cause lots of problems ## when they don't work right. clean: mostlyclean versionclean - $(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \ + -$(RM) libextcli* $(LISP)/auto-autoloads.el* $(LISP)/custom-load.el* \ $(LISP)/mule/auto-autoloads.el* $(LISP)/mule/custom-load.el* \ $(SRCMODULES)/auto-autoloads.el* $(SRCMODULES)/custom-load.el* ## This is used in making a distribution. ## Do not use it on development directories! distclean-noconfig: clean - $(RM) config.h paths.h Emacs.ad.h $(LISP)/finder-inf.el* \ + -$(RM) config.h paths.h Emacs.ad.h $(LISP)/finder-inf.el* \ TAGS xemacs.def xemacs.def.in ## This is used in making a distribution. ## Do not use it on development directories! distclean: distclean-noconfig - $(RM) GNUmakefile Makefile Makefile.in + -$(RM) GNUmakefile Makefile Makefile.in realclean-noconfig: distclean-noconfig realclean: distclean extraclean-noconfig: realclean-noconfig - $(RM) *~ \#* m/*~ m/\#* s/*~ s/\#* + -$(RM) *~ \#* m/*~ m/\#* s/*~ s/\#* extraclean: realclean - $(RM) *~ \#* m/*~ m/\#* s/*~ s/\#* + -$(RM) *~ \#* m/*~ m/\#* s/*~ s/\#* ###################### Lock, unlock Index: lib-src/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/Makefile.in.in,v retrieving revision 1.48 diff -u -p -r1.48 Makefile.in.in --- lib-src/Makefile.in.in 2005/11/13 10:39:32 1.48 +++ lib-src/Makefile.in.in 2005/11/22 06:25:29 ＠＠ -273,21 +273,21 ＠＠ uninstall: .PHONY: mostlyclean clean distclean realclean extraclean .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig mostlyclean: - $(RM) *.o *.i core + -$(RM) *.o *.i core clean: mostlyclean - $(RM) ${EXES} *.exe + -$(RM) ${EXES} *.exe distclean-noconfig: clean - $(RM) DOC *.tab.c *.tab.h TAGS ellcc.h blessmail config.values + -$(RM) DOC *.tab.c *.tab.h TAGS ellcc.h blessmail config.values ## This is used in making a distribution. ## Do not use it on development directories! distclean: distclean-noconfig - $(RM) GNUmakefile Makefile Makefile.in + -$(RM) GNUmakefile Makefile Makefile.in realclean-noconfig: distclean-noconfig realclean: distclean extraclean-noconfig: realclean-noconfig - $(RM) *~ \#* + -$(RM) *~ \#* extraclean: realclean - $(RM) *~ \#* + -$(RM) *~ \#* ## Test the contents of the directory. check: Index: lwlib/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/Makefile.in.in,v retrieving revision 1.19 diff -u -p -r1.19 Makefile.in.in --- lwlib/Makefile.in.in 2005/11/13 10:39:34 1.19 +++ lwlib/Makefile.in.in 2005/11/22 06:25:32 ＠＠ -85,20 +85,20 ＠＠ liblw.a: $(objs) .PHONY: mostlyclean clean distclean realclean extraclean .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig mostlyclean: - $(RM) liblw.a liblw_pure_*.a *.o *.i core + -$(RM) liblw.a liblw_pure_*.a *.o *.i core clean: mostlyclean distclean-noconfig: clean - $(RM) config.h TAGS + -$(RM) config.h TAGS ## This is used in making a distribution. ## Do not use it on development directories! distclean: distclean-noconfig - $(RM) GNUmakefile Makefile Makefile.in + -$(RM) GNUmakefile Makefile Makefile.in realclean-noconfig: distclean-noconfig realclean: distclean extraclean-noconfig: realclean-noconfig - $(RM) *~ \#* + -$(RM) *~ \#* extraclean: realclean - $(RM) *~ \#* + -$(RM) *~ \#* CONFIG_H = ../src/config.h config.h Index: dynodump/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/dynodump/Makefile.in.in,v retrieving revision 1.13 diff -u -p -r1.13 Makefile.in.in --- dynodump/Makefile.in.in 2005/11/13 10:39:40 1.13 +++ dynodump/Makefile.in.in 2005/11/22 06:25:37 ＠＠ -78,18 +78,18 ＠＠ uninit.o: ${srcdir}/$(ARCH)/uninit.c .PHONY: mostlyclean clean distclean realclean extraclean .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig mostlyclean: - $(RM) *.o *.i core + -$(RM) *.o *.i core clean: mostlyclean - $(RM) *.so *.so.1 + -$(RM) *.so *.so.1 distclean-noconfig: clean - $(RM) TAGS + -$(RM) TAGS ## This is used in making a distribution. ## Do not use it on development directories! distclean: distclean-noconfig - $(RM) GNUmakefile Makefile Makefile.in + -$(RM) GNUmakefile Makefile Makefile.in realclean-noconfig: distclean-noconfig realclean: distclean extraclean-noconfig: realclean-noconfig - $(RM) *~ \#* + -$(RM) *~ \#* extraclean: realclean - $(RM) *~ \#* + -$(RM) *~ \#* Index: netinstall/Makefile.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/Makefile.in.in,v retrieving revision 1.6 diff -u -p -r1.6 Makefile.in.in --- netinstall/Makefile.in.in 2005/11/13 10:39:31 1.6 +++ netinstall/Makefile.in.in 2005/11/22 06:25:39 ＠＠ -202,21 +202,21 ＠＠ inilex.c : inilex.l iniparse.h .PHONY: mostlyclean clean distclean realclean extraclean .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig mostlyclean: - $(RM) *.o *.i *.ini core + -$(RM) *.o *.i *.ini core clean: mostlyclean - $(RM) $(PROGS) + -$(RM) $(PROGS) distclean-noconfig: clean - $(RM) TAGS + -$(RM) TAGS ## This is used in making a distribution. ## Do not use it on development directories! distclean: distclean-noconfig - $(RM) GNUmakefile Makefile Makefile.in + -$(RM) GNUmakefile Makefile Makefile.in realclean-noconfig: distclean-noconfig realclean: distclean extraclean-noconfig: realclean-noconfig - $(RM) *~ \#* + -$(RM) *~ \#* extraclean: realclean - $(RM) *~ \#* + -$(RM) *~ \#* choose.o: choose.cc win32.h dialog.h resource.h state.h ini.h concat.h \ msg.h log.h find.h reginfo.h Index: modules/common/Makefile.common =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/common/Makefile.common,v retrieving revision 1.11 diff -u -p -r1.11 Makefile.common --- modules/common/Makefile.common 2005/11/13 10:39:41 1.11 +++ modules/common/Makefile.common 2005/11/22 06:25:43 ＠＠ -81,21 +81,21 ＠＠ $(MODNAME)_i.c: $(SRCS) .PHONY: mostlyclean clean distclean realclean extraclean .PHONY: distclean-noconfig realclean-noconfig extraclean-noconfig mostlyclean: - $(RM) $(OBJS) $(MODNAME)_i.* core + -$(RM) $(OBJS) $(MODNAME)_i.* core clean: mostlyclean - $(RM) $(MODNAME).ell + -$(RM) $(MODNAME).ell distclean-noconfig: clean - $(RM) config.* TAGS + -$(RM) config.* TAGS ## This is used in making a distribution. ## Do not use it on development directories! distclean: distclean-noconfig - $(RM) GNUmakefile Makefile Makefile.in configure + -$(RM) GNUmakefile Makefile Makefile.in configure realclean-noconfig: distclean-noconfig realclean: distclean extraclean-noconfig: realclean-noconfig - $(RM) *~ \#* + -$(RM) *~ \#* extraclean: realclean - $(RM) *~ \#* + -$(RM) *~ \#* install: $(OBJECT_TO_BUILD) $(INSTALL_PROGRAM) $< $(INSTALLPATH)