Re: Changes in lisp/Makefile.in to skip preloaded files

[Juanma Barranquero]

On Fri, Oct 9, 2009 at 01:08, Lennart Borgman <address@hidden> wrote:

> Thanks for working on this, but what is the status right now? Is it
> possible to build Emacs on w32?

Apply the following patch to temporarily remove the changes that
disable autoload generation on Windows. (This is not a "fix", is just
a workaround.)

    Juanma


Index: lisp/emacs-lisp/autoload.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.149
diff -u -2 -r1.149 autoload.el
--- lisp/emacs-lisp/autoload.el 7 Oct 2009 16:10:37 -0000       1.149
+++ lisp/emacs-lisp/autoload.el 7 Oct 2009 17:23:46 -0000
@@ -684,18 +684,16 @@
   "Update loaddefs.el autoloads in batch mode.
 Calls `update-directory-autoloads' on the command line arguments."
-  ;; For use during the Emacs build process only.
-  (unless autoload-excludes
-    (let* ((ldir (file-name-directory generated-autoload-file))
-          (mfile (expand-file-name "../src/Makefile" ldir))
-          lim)
-      (when (file-readable-p mfile)
-       (with-temp-buffer
-         (insert-file-contents mfile)
-         (when (re-search-forward "^lisp= " nil t)
-           (setq lim (line-end-position))
-           (while (re-search-forward "\\${lispsource}\\([^ ]+\\.el\\)c?\\>"
-                                     lim t)
-             (push (expand-file-name (match-string 1) ldir)
-                   autoload-excludes)))))))
+  ;; For use during the Emacs build process only.  We do the file-name
+  ;; expansion here rather than in lisp/Makefile in order to keep the
+  ;; shell command line short.  (Long lines are an issue on some systems.)
+  (if (stringp autoload-excludes)
+      (setq autoload-excludes
+           (mapcar
+            (lambda (file)
+              (concat
+               (expand-file-name (file-name-sans-extension file)
+                                 (file-name-directory generated-autoload-file))
+               ".el"))
+            (split-string autoload-excludes))))
   (let ((args command-line-args-left))
     (setq command-line-args-left nil)