User: ben
Date: 05/11/22 08:14:55
Modified: xemacs/modules/common Makefile.common
Log:
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.
Revision Changes Path
1.52 +5 -0 XEmacs/xemacs/modules/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- ChangeLog 2005/11/16 07:14:13 1.51
+++ ChangeLog 2005/11/22 07:14:37 1.52
@@ -1,3 +1,8 @@
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * common/Makefile.common (mostlyclean):
+ Ignore errors from rm during clean.
+
2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org>
* canna/canna_api.c: Small fixes to Mule-ization patch.
1.40 +5 -0 XEmacs/xemacs/netinstall/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ChangeLog 2005/11/13 10:39:31 1.39
+++ ChangeLog 2005/11/22 07:14:39 1.40
@@ -1,3 +1,8 @@
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ Ignore errors from rm during clean.
+
2005-11-13 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
1.7 +6 -6 XEmacs/xemacs/netinstall/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/Makefile.in.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- Makefile.in.in 2005/11/13 10:39:31 1.6
+++ Makefile.in.in 2005/11/22 07:14:39 1.7
@@ -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
1.75 +5 -0 XEmacs/xemacs/lwlib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- ChangeLog 2005/11/16 07:22:42 1.74
+++ ChangeLog 2005/11/22 07:14:40 1.75
@@ -1,3 +1,8 @@
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ Ignore errors from rm during clean.
+
2005-11-16 Stephen J. Turnbull <stephen(a)xemacs.org>
* xlwcheckbox.c (CheckboxInit): Mark unused parameters. C++
1.20 +5 -5 XEmacs/xemacs/lwlib/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/Makefile.in.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- Makefile.in.in 2005/11/13 10:39:34 1.19
+++ Makefile.in.in 2005/11/22 07:14:40 1.20
@@ -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
1.199 +5 -0 XEmacs/xemacs/lib-src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- ChangeLog 2005/11/13 10:39:32 1.198
+++ ChangeLog 2005/11/22 07:14:41 1.199
@@ -1,3 +1,8 @@
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in:
+ Ignore errors from rm during clean.
+
2005-11-13 Ben Wing <ben(a)xemacs.org>
* Makefile.in.in:
1.49 +6 -6 XEmacs/xemacs/lib-src/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/Makefile.in.in,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- Makefile.in.in 2005/11/13 10:39:32 1.48
+++ Makefile.in.in 2005/11/22 07:14:42 1.49
@@ -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:
1.887 +5 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.886
retrieving revision 1.887
diff -u -p -r1.886 -r1.887
--- ChangeLog 2005/11/18 12:23:55 1.886
+++ ChangeLog 2005/11/22 07:14:43 1.887
@@ -1,3 +1,8 @@
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * Makefile.in.in (mostlyclean):
+ Ignore errors from rm during clean.
+
2005-11-18 Aidan Kehoe <kehoea(a)parhasard.net>
* window.c (change_window_height): Have change_window_height
1.121 +7 -7 XEmacs/xemacs/src/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -p -r1.120 -r1.121
--- Makefile.in.in 2005/11/13 10:39:36 1.120
+++ Makefile.in.in 2005/11/22 07:14:44 1.121
@@ -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
1.472 +17 -0 XEmacs/xemacs/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.471
retrieving revision 1.472
diff -u -p -r1.471 -r1.472
--- ChangeLog 2005/11/16 12:12:57 1.471
+++ ChangeLog 2005/11/22 07:14:47 1.472
@@ -1,3 +1,20 @@
+2005-11-22 Ben Wing <ben(a)xemacs.org>
+
+ * dynodump/Makefile.in.in (mostlyclean):
+ Ignore errors from rm during clean.
+
+2005-11-22 Ben Wing <ben(a)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(a)xemacs.org>
* Makefile.in.in: Install PROBLEMS into .../etc
1.29 +13 -13 XEmacs/xemacs/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- Makefile.in.in 2005/11/16 12:12:57 1.28
+++ Makefile.in.in 2005/11/22 07:14:48 1.29
@@ -534,7 +534,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
@@ -552,10 +552,10 @@ 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) 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 @@ 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
@@ -576,9 +576,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
@@ -587,7 +587,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
@@ -613,7 +613,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
@@ -662,7 +662,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} && \
1.14 +6 -6 XEmacs/xemacs/dynodump/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/dynodump/Makefile.in.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Makefile.in.in 2005/11/13 10:39:40 1.13
+++ Makefile.in.in 2005/11/22 07:14:50 1.14
@@ -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) *~ \#*
1.12 +6 -6 XEmacs/xemacs/modules/common/Makefile.common
Index: Makefile.common
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/common/Makefile.common,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- Makefile.common 2005/11/13 10:39:41 1.11
+++ Makefile.common 2005/11/22 07:14:54 1.12
@@ -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)