Mercurial > hg > xemacs-beta
changeset 3083:193188e494b2
[xemacs-hg @ 2005-11-22 07:14:37 by ben]
fix problems building with CVS dirs
dynodump/Makefile.in.in: Ignore errors from rm during clean.
Makefile.in.in: Ignore errors from rm during clean, to prevent problems trying to
remove lock/CVS.
Makefile.in.in: Ignore errors from rm during clean.
Makefile.in.in: Ignore errors from rm during clean.
Makefile.in.in: Ignore errors from rm during clean.
Makefile.in.in: Ignore errors from rm during clean.
common/Makefile.common: Ignore errors from rm during clean.
| author | ben |
|---|---|
| date | Tue, 22 Nov 2005 07:14:54 +0000 |
| parents | 990996ef092b |
| children | aaf96f4ba612 |
| files | ChangeLog Makefile.in.in dynodump/Makefile.in.in lib-src/ChangeLog lib-src/Makefile.in.in lwlib/ChangeLog lwlib/Makefile.in.in modules/ChangeLog modules/common/Makefile.common netinstall/ChangeLog netinstall/Makefile.in.in src/ChangeLog src/Makefile.in.in |
| diffstat | 13 files changed, 91 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Nov 21 22:51:03 2005 +0000 +++ b/ChangeLog Tue Nov 22 07:14:54 2005 +0000 @@ -1,3 +1,20 @@ +2005-11-22 Ben Wing <ben@xemacs.org> + + * dynodump/Makefile.in.in (mostlyclean): + Ignore errors from rm during clean. + +2005-11-22 Ben Wing <ben@xemacs.org> + + * 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. + 2005-11-08 Malcolm Purvis <malcolmp@xemacs.org> * Makefile.in.in: Install PROBLEMS into .../etc
--- a/Makefile.in.in Mon Nov 21 22:51:03 2005 +0000 +++ b/Makefile.in.in Tue Nov 22 07:14:54 2005 +0000 @@ -534,7 +534,7 @@ ## 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 @@ -552,10 +552,10 @@ ## 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) etc/PROBLEMS + -$(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) etc/PROBLEMS clean: top-mostlyclean top-clean for d in $(SUBDIR); do (cd ./$$d && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@); done @@ -563,8 +563,8 @@ ## `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 @@ -576,9 +576,9 @@ ## `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 @@ -587,7 +587,7 @@ ## 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 @@ -613,7 +613,7 @@ ## `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 @@ -662,7 +662,7 @@ 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} && \
--- a/dynodump/Makefile.in.in Mon Nov 21 22:51:03 2005 +0000 +++ b/dynodump/Makefile.in.in Tue Nov 22 07:14:54 2005 +0000 @@ -78,18 +78,18 @@ .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) *~ \#*
--- a/lib-src/ChangeLog Mon Nov 21 22:51:03 2005 +0000 +++ b/lib-src/ChangeLog Tue Nov 22 07:14:54 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-22 Ben Wing <ben@xemacs.org> + + * Makefile.in.in: + Ignore errors from rm during clean. + 2005-11-13 Ben Wing <ben@xemacs.org> * Makefile.in.in:
--- a/lib-src/Makefile.in.in Mon Nov 21 22:51:03 2005 +0000 +++ b/lib-src/Makefile.in.in Tue Nov 22 07:14:54 2005 +0000 @@ -273,21 +273,21 @@ .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:
--- a/lwlib/ChangeLog Mon Nov 21 22:51:03 2005 +0000 +++ b/lwlib/ChangeLog Tue Nov 22 07:14:54 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-22 Ben Wing <ben@xemacs.org> + + * Makefile.in.in: + Ignore errors from rm during clean. + 2005-11-16 Stephen J. Turnbull <stephen@xemacs.org> * xlwcheckbox.c (CheckboxInit): Mark unused parameters. C++
--- a/lwlib/Makefile.in.in Mon Nov 21 22:51:03 2005 +0000 +++ b/lwlib/Makefile.in.in Tue Nov 22 07:14:54 2005 +0000 @@ -85,20 +85,20 @@ .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
--- a/modules/ChangeLog Mon Nov 21 22:51:03 2005 +0000 +++ b/modules/ChangeLog Tue Nov 22 07:14:54 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-22 Ben Wing <ben@xemacs.org> + + * common/Makefile.common (mostlyclean): + Ignore errors from rm during clean. + 2005-11-16 Stephen J. Turnbull <stephen@xemacs.org> * canna/canna_api.c: Small fixes to Mule-ization patch.
--- a/modules/common/Makefile.common Mon Nov 21 22:51:03 2005 +0000 +++ b/modules/common/Makefile.common Tue Nov 22 07:14:54 2005 +0000 @@ -81,21 +81,21 @@ .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)
--- a/netinstall/ChangeLog Mon Nov 21 22:51:03 2005 +0000 +++ b/netinstall/ChangeLog Tue Nov 22 07:14:54 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-22 Ben Wing <ben@xemacs.org> + + * Makefile.in.in: + Ignore errors from rm during clean. + 2005-11-13 Ben Wing <ben@xemacs.org> * Makefile.in.in:
--- a/netinstall/Makefile.in.in Mon Nov 21 22:51:03 2005 +0000 +++ b/netinstall/Makefile.in.in Tue Nov 22 07:14:54 2005 +0000 @@ -202,21 +202,21 @@ .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
--- a/src/ChangeLog Mon Nov 21 22:51:03 2005 +0000 +++ b/src/ChangeLog Tue Nov 22 07:14:54 2005 +0000 @@ -1,3 +1,8 @@ +2005-11-22 Ben Wing <ben@xemacs.org> + + * Makefile.in.in (mostlyclean): + Ignore errors from rm during clean. + 2005-11-18 Aidan Kehoe <kehoea@parhasard.net> * window.c (change_window_height): Have change_window_height
--- a/src/Makefile.in.in Mon Nov 21 22:51:03 2005 +0000 +++ b/src/Makefile.in.in Tue Nov 22 07:14:54 2005 +0000 @@ -1007,33 +1007,33 @@ .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