"distclean" and "bootstrap-distclean" targets for Windows port

[Peter 'Luna' Runestig]

[I resend this, since "gnu.org" been dead for a while. Hope the 
formatting's OK...]

----- Forwarded message from Peter 'Luna' Runestig 
<address@hidden> -----
    Date: 06 Sep 2003 01:15:41 +0200
    From: Peter 'Luna' Runestig <address@hidden>
Reply-To: Peter 'Luna' Runestig <address@hidden>
 Subject: "distclean" and "bootstrap-distclean" targets for Windows 
port
      To: address@hidden

Hi all!

This is an attemp to add "distclean" and "bootstrap-distclean" targets
to the Windows port.

diff -bur emacs-cvs-20030904.orig/leim/ChangeLog emacs-cvs-
20030904/leim/ChangeLog
--- emacs-cvs-20030904.orig/leim/ChangeLog      2003-09-03 
10:14:50.000000000 +0200
+++ emacs-cvs-20030904/leim/ChangeLog   2003-09-06 00:31:22.000000000 
+0200
@@ -1,3 +1,7 @@
+2003-09-05  Peter 'Luna' Runestig <address@hidden> (tiny change)
+
+       * makefile.w32-in: Fix the 'distclean' target.
+
 2003-08-25  Jesper Harder  <address@hidden>  (tiny change)
 
        * quail/latin-pre.el ("german-prefix"): Fix typo in the 
docstring.
diff -bur emacs-cvs-20030904.orig/leim/makefile.w32-in emacs-cvs-
20030904/leim/makefile.w32-in
--- emacs-cvs-20030904.orig/leim/makefile.w32-in        2003-09-03 
10:14:50.000000000 +0200
+++ emacs-cvs-20030904/leim/makefile.w32-in     2003-09-05 
20:37:44.000000000 +0200
@@ -198,8 +198,8 @@
        - $(FOREACH) $(MISC_DIC:.elc=.el) $(FORDO) $(DEL) $(FORVAR) 
$(ENDFOR)
        - $(DEL) leim-list.el
 
-distclean maintainer-clean:
+distclean maintainer-clean: clean
        if exist stamp-subdir $(DELTREE) $(SUBDIRS)
-       - $(DEL) stamp-subdir
+       - $(DEL) stamp-subdir Makefile
 
 # arch-tag: 08250c45-fa9c-4f39-a175-a0c5c36dd67b
diff -bur emacs-cvs-20030904.orig/lib-src/ChangeLog emacs-cvs-
20030904/lib-src/ChangeLog
--- emacs-cvs-20030904.orig/lib-src/ChangeLog   2003-09-04 
09:19:33.000000000 +0200
+++ emacs-cvs-20030904/lib-src/ChangeLog        2003-09-06 
00:43:01.000000000 +0200
@@ -1,3 +1,7 @@
+2003-09-05  Peter 'Luna' Runestig <address@hidden> (tiny change)
+
+       * makefile.w32-in: Add the 'distclean' target.
+
 2003-08-25  Takaaki Ota  <address@hidden>  (tiny change)
 
        * etags.c (consider_token): check C++ `operator' only when the
diff -bur emacs-cvs-20030904.orig/lib-src/makefile.w32-in emacs-cvs-
20030904/lib-src/makefile.w32-in
--- emacs-cvs-20030904.orig/lib-src/makefile.w32-in     2003-09-03 
10:14:52.000000000 +0200
+++ emacs-cvs-20030904/lib-src/makefile.w32-in  2003-09-05 
13:38:59.000000000 +0200
@@ -270,6 +270,10 @@
                - $(DEL_TREE) oo
                - $(DEL_TREE) oo-spd
 
+distclean:     cleanall
+               - $(DEL) TAGS
+               - $(DEL) Makefile Makefile.c blessmail
+
 #
 # Headers we would preprocess if we could.
 #
diff -bur emacs-cvs-20030904.orig/lisp/ChangeLog emacs-cvs-
20030904/lisp/ChangeLog
--- emacs-cvs-20030904.orig/lisp/ChangeLog      2003-09-03 
10:14:52.000000000 +0200
+++ emacs-cvs-20030904/lisp/ChangeLog   2003-09-06 00:34:58.000000000 
+0200
@@ -1,3 +1,7 @@
+2003-09-05  Peter 'Luna' Runestig <address@hidden> (tiny change)
+
+       * makefile.w32-in: Add the 'distclean' target.
+
 2003-09-02  Jason Rumney  <address@hidden>
 
        * international/titdic-cnv.el (tsang-quick-converter): Fix 
broken
diff -bur emacs-cvs-20030904.orig/lisp/makefile.w32-in emacs-cvs-
20030904/lisp/makefile.w32-in
--- emacs-cvs-20030904.orig/lisp/makefile.w32-in        2003-09-03 
10:14:58.000000000 +0200
+++ emacs-cvs-20030904/lisp/makefile.w32-in     2003-09-05 
21:50:42.000000000 +0200
@@ -407,4 +407,8 @@
 clean:
                - $(DEL) *~
 
+distclean:     clean
+               - $(DEL) Makefile Makefile.unix cus-load.el finder-
inf.el subdirs.el \
+                        eshell/esh-groups.el eshell/esh-groups.el~
+
 # arch-tag: bd03b562-c58d-4403-99db-c7bccd8c49a0
diff -bur emacs-cvs-20030904.orig/lispintro/ChangeLog emacs-cvs-
20030904/lispintro/ChangeLog
--- emacs-cvs-20030904.orig/lispintro/ChangeLog 2003-09-04 
09:19:34.000000000 +0200
+++ emacs-cvs-20030904/lispintro/ChangeLog      2003-09-06 
00:36:40.000000000 +0200
@@ -1,3 +1,7 @@
+2003-09-05  Peter 'Luna' Runestig <address@hidden> (tiny change)
+
+       * makefile.w32-in: Fix the 'distclean' target.
+
 2003-09-03  Peter Runestig  <address@hidden>
 
        * makefile.w32-in: New file.
diff -bur emacs-cvs-20030904.orig/lispintro/makefile.w32-in emacs-cvs-
20030904/lispintro/makefile.w32-in
--- emacs-cvs-20030904.orig/lispintro/makefile.w32-in   2003-09-04 
06:00:49.000000000 +0200
+++ emacs-cvs-20030904/lispintro/makefile.w32-in        2003-09-05 
21:51:57.000000000 +0200
@@ -61,9 +61,10 @@
 clean: mostlyclean
        rm -f *.dvi $(infodir)/eintr*
 
-distclean: clean
+distclean: maintainer-clean
+       rm -f Makefile
 
-maintainer-clean: distclean
+maintainer-clean: clean
        rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -bur emacs-cvs-20030904.orig/lispref/ChangeLog emacs-cvs-
20030904/lispref/ChangeLog
--- emacs-cvs-20030904.orig/lispref/ChangeLog   2003-09-04 
09:19:34.000000000 +0200
+++ emacs-cvs-20030904/lispref/ChangeLog        2003-09-06 
00:37:40.000000000 +0200
@@ -1,3 +1,7 @@
+2003-09-05  Peter 'Luna' Runestig <address@hidden> (tiny change)
+
+       * makefile.w32-in: Fix the 'distclean' target.
+
 2003-09-03  Peter Runestig  <address@hidden>
 
        * makefile.w32-in: New file.
diff -bur emacs-cvs-20030904.orig/lispref/makefile.w32-in emacs-cvs-
20030904/lispref/makefile.w32-in
--- emacs-cvs-20030904.orig/lispref/makefile.w32-in     2003-09-04 
06:00:49.000000000 +0200
+++ emacs-cvs-20030904/lispref/makefile.w32-in  2003-09-05 
21:05:44.000000000 +0200
@@ -132,7 +132,8 @@
        rm -f index.texi
        rm -f $(infodir)/elisp*
 
-distclean: clean
+distclean: maintainer-clean
+       rm -f Makefile
 
 maintainer-clean: clean
        rm -f elisp elisp-* elisp.dvi elisp.oaux
diff -bur emacs-cvs-20030904.orig/man/ChangeLog emacs-cvs-
20030904/man/ChangeLog
--- emacs-cvs-20030904.orig/man/ChangeLog       2003-09-04 
09:19:35.000000000 +0200
+++ emacs-cvs-20030904/man/ChangeLog    2003-09-06 00:38:28.000000000 
+0200
@@ -1,3 +1,7 @@
+2003-09-05  Peter 'Luna' Runestig <address@hidden> (tiny change)
+
+       * makefile.w32-in: Fix the 'distclean' target.
+
 2003-09-03  Peter Runestig  <address@hidden>
 
        * makefile.w32-in: New file.
Only in emacs-cvs-20030904/man: ChangeLog.~1.213.~
diff -bur emacs-cvs-20030904.orig/man/makefile.w32-in emacs-cvs-
20030904/man/makefile.w32-in
--- emacs-cvs-20030904.orig/man/makefile.w32-in 2003-09-04 
06:00:49.000000000 +0200
+++ emacs-cvs-20030904/man/makefile.w32-in      2003-09-05 
14:03:28.000000000 +0200
@@ -312,9 +312,10 @@
                $(infodir)/speedbar* $(infodir)/tramp* \
                $(infodir)/ses* $(infodir)/smtpmail*
 
-distclean: clean
+distclean: maintainer-clean
+       rm -f Makefile
 
-maintainer-clean: distclean
+maintainer-clean: clean
        rm -f *.aux *.cps *.fns *.kys *.pgs *.vrs *.toc
 # Don't delete these, because they are outside the current directory.
 #      for file in $(INFO_TARGETS); do rm -f $${file}*; done
diff -bur emacs-cvs-20030904.orig/nt/ChangeLog emacs-cvs-
20030904/nt/ChangeLog
--- emacs-cvs-20030904.orig/nt/ChangeLog        2003-09-04 
09:19:35.000000000 +0200
+++ emacs-cvs-20030904/nt/ChangeLog     2003-09-06 00:41:57.000000000 
+0200
@@ -1,3 +1,8 @@
+2003-09-05  Peter 'Luna' Runestig <address@hidden>
+
+       * configure.bat, makefile.w32-in: Adding the 'distclean' and
+       'bootstrap-distclean' targets.
+
 2003-09-03  Peter Runestig <address@hidden>
 
        * configure.bat: Create ``makefile'' in directories man, 
lispref
diff -bur emacs-cvs-20030904.orig/nt/configure.bat emacs-cvs-
20030904/nt/configure.bat
--- emacs-cvs-20030904.orig/nt/configure.bat    2003-09-04 
09:19:35.000000000 +0200
+++ emacs-cvs-20030904/nt/configure.bat 2003-09-05 20:47:10.000000000 
+0200
@@ -436,7 +436,7 @@
 copy /b config.settings+%MAKECMD%.defs+..\man\makefile.w32-
in ..\man\makefile
 copy /b config.settings+%MAKECMD%.defs+..\lispref\makefile.w32-
in ..\lispref\makefile
 copy /b config.settings+%MAKECMD%.defs+..\lispintro\makefile.w32-
in ..\lispintro\makefile
-if not exist ..\lisp\Makefile.unix rename ..\lisp\Makefile.in 
Makefile.unix
+if not exist ..\lisp\Makefile.unix 
copy ..\lisp\Makefile.in ..\lisp\Makefile.unix
 if exist ..\lisp\makefile rm -f ../lisp/[Mm]akefile
 copy /b config.settings+%MAKECMD%.defs+..\lisp\makefile.w32-
in ..\lisp\makefile
 rem   Use the default (no-op) Makefile.in if the nt version is not 
present.
diff -bur emacs-cvs-20030904.orig/nt/makefile.w32-in emacs-cvs-
20030904/nt/makefile.w32-in
--- emacs-cvs-20030904.orig/nt/makefile.w32-in  2003-09-04 
09:19:35.000000000 +0200
+++ emacs-cvs-20030904/nt/makefile.w32-in       2003-09-05 
21:02:25.000000000 +0200
@@ -274,4 +274,32 @@
 realclean: cleanall
        - $(DEL_TREE) ../bin
 
+distclean:
+       cd ..\lib-src
+       $(MAKE) $(MFLAGS) distclean
+       cd ..\src
+       $(MAKE) $(MFLAGS) distclean
+       cd ..\lisp
+       $(MAKE) $(MFLAGS) distclean
+       cd ..\lispintro
+       $(MAKE) $(MFLAGS) distclean
+       cd ..\lispref
+       $(MAKE) $(MFLAGS) distclean
+       cd ..\leim
+       $(MAKE) $(MFLAGS) distclean
+       cd ..\man
+       $(MAKE) $(MFLAGS) distclean
+       cd ..\nt
+       - $(DEL) *~ $(COMPILER_TEMP_FILES)
+       - $(DEL_TREE) $(OBJDIR)
+       - $(DEL) ../etc/DOC ../etc/DOC-X
+       - $(DEL_TREE) ../bin
+       - $(DEL) Makefile ../site-lisp/subdirs.el
+
+bootstrap-distclean:
+       cd ..\lisp
+       $(MAKE) $(MFLAGS) bootstrap-clean
+       cd ..\nt
+       $(MAKE) $(MFLAGS) distclean
+
 # arch-tag: 6f5b23a6-774b-4598-9c29-58235b2b4219
diff -bur emacs-cvs-20030904.orig/src/ChangeLog emacs-cvs-
20030904/src/ChangeLog
--- emacs-cvs-20030904.orig/src/ChangeLog       2003-09-03 
10:15:33.000000000 +0200
+++ emacs-cvs-20030904/src/ChangeLog    2003-09-06 00:42:50.000000000 
+0200
@@ -1,3 +1,7 @@
+2003-09-05  Peter 'Luna' Runestig <address@hidden> (tiny change)
+
+       * makefile.w32-in: Fixing the 'distclean' target.
+
 2003-09-03  Kim F. Storm  <address@hidden>
 
        * xdisp.c (get_window_cursor_type): Partially undo 2002-03-01
diff -bur emacs-cvs-20030904.orig/src/makefile.w32-in emacs-cvs-
20030904/src/makefile.w32-in
--- emacs-cvs-20030904.orig/src/makefile.w32-in 2003-09-03 
10:15:39.000000000 +0200
+++ emacs-cvs-20030904/src/makefile.w32-in      2003-09-05 
14:04:07.000000000 +0200
@@ -241,7 +241,7 @@
        - $(DEL_TREE) $(OBJDIR)
 
 distclean:     clean
-       - $(DEL) config.h epaths.h
+       - $(DEL) config.h epaths.h Makefile
 
 cleanall:      clean
        - $(DEL_TREE) obj