Remove the SOME_MACHINE_LISP distinction in src/Makefile.in.

See discussion in http://debbugs.gnu.org/8302

* configure.in (NS_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(WINDOW_SUPPORT): Remove output variables that are no longer used.

* lib-src/makefile.w32-in (echolisp): Remove rule that is no longer needed.
(clean): No more echolisp.tmp.

* .bzrignore: Remove lib-src/echolisp.tmp.

* lisp/emacs-lisp/autoload.el (batch-update-autoloads):
Set autoload-excludes by parsing lisp/loadup.el rather than Makefiles.

* lisp/loadup.el: Update commentary.

* msdos/sed1x.inp (TOOLTIP_SUPPORT, WINDOW_SUPPORT):
* msdos/sed1v2.inp (MSDOS_SUPPORT, NS_SUPPORT, MOUSE_SUPPORT)
(TOOLTIP_SUPPORT, WINDOW_SUPPORT): No need to edit these any more.

* src/Makefile.in (MSDOS_SUPPORT_REAL, MSDOS_SUPPORT, NS_SUPPORT)
(REAL_MOUSE_SUPPORT, GPM_MOUSE_SUPPORT, MOUSE_SUPPORT, TOOLTIP_SUPPORT)
(BASE_WINDOW_SUPPORT, X_WINDOW_SUPPORT, WINDOW_SUPPORT): Remove.
(lisp): Set the order to that of loadup.el.
(shortlisp): Make it a copy of $lisp.
(SOME_MACHINE_LISP): Remove.
($(etc)/DOC): Depend just on $lisp, not $SOME_MACHINE_LISP too.
Use just $shortlisp, not $SOME_MACHINE_LISP too.

2 files changed, 5 insertions, 6 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 27dc3a14d48..33778c1f0ae 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * makefile.w32-in (echolisp): Remove rule that is no longer needed.
+        (clean): No more echolisp.tmp.
+
 2011-05-18  Glenn Morris  <rgm@gnu.org>
 
         * fakemail.c: Remove file.
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 0e203d18bd2..07f6170afe4 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -269,11 +269,6 @@ lisp2 = \
         $(lispsource)window.elc \
         $(lispsource)version.el
 
-# Used by batch-update-autoloads.
-echolisp:
-        @echo $(lisp1)
-        @echo $(lisp2)
-
 # This is needed the first time we build the tree, since temacs.exe
 # does not exist yet, and the DOC rule needs it to rebuild DOC whenever
 # Emacs is rebuilt.
@@ -330,7 +325,6 @@ clean:
                 - $(DEL) ctags.c
                 - $(DEL_TREE) $(OBJDIR)
                 - $(DEL) stamp_BLD
-                - $(DEL) echolisp.tmp
 
 distclean: cleanall
         - $(DEL) TAGS