Re: AUCTeX doesn't build with latest Emacs master

[Arash Esbati]

Tassilo Horn <tsdh@gnu.org> writes:

> Ikumi Keita <ikumi@ikumi.que.jp> writes:
>
>> How about specifying preview.el as EXCLUDED-FILES argument when
>> --disable-preview is given?
>
> I don't think we need to check that option: if we want to stick to the
> current way, we need to add preview.el to EXCLUDED-FILES in the
> auto-loads.el rule and AUCSCR in the preview-latex.el rule.  That would
> probably work.

I just tried this version by hand and did this in Makefile.in:

--8<---------------cut here---------------start------------->8---
diff --git a/Makefile.in b/Makefile.in
index d62644f9..9b26ecf1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,14 +52,33 @@ PACKAGE=auctex
 PACKAGE_INFO=auctex preview-latex
 EMACS=@EMACS@
 ELCC=$(EMACS) -batch -q -no-site-file -no-init-file -l lpath.el
-AUTOLOAD=--eval '(let ((autoload-file (expand-file-name "$@"))) \
-  (mapcar (lambda (file) \
-            (update-file-autoloads file nil autoload-file)) \
-          command-line-args-left) \
+AUTOLOAD=--eval '\
+(let* ((autoload-file (expand-file-name "$@")) \
+       (autoload-file-dir (file-name-directory autoload-file)) \
+       (autoload-file-name (file-name-nondirectory autoload-file))) \
+  (if (fboundp (quote loaddefs-generate)) \
+      (loaddefs-generate autoload-file-dir autoload-file-name \
+                         (quote ("preview.el"))) \
+    (mapcar (lambda (file) \
+              (update-file-autoloads file nil autoload-file)) \
+            command-line-args-left)) \
   (save-buffers-kill-emacs t))'

-PREVIEW_AUTOLOAD=--eval '(let ((autoload-file (expand-file-name "$@"))) \
-  (update-file-autoloads "preview.el" nil autoload-file) \
+PREVIEW_AUTOLOAD=--eval '\
+(let* ((autoload-file (expand-file-name "$@")) \
+       (autoload-file-dir (file-name-directory autoload-file)) \
+       (autoload-file-name (file-name-nondirectory autoload-file))) \
+  (if (fboundp (quote loaddefs-generate)) \
+      (loaddefs-generate autoload-file-dir autoload-file-name \
+                         (quote ("tex.el" "tex-style.el" "plain-tex.el" \
+                                "latex.el" "tex-info.el" \
+                                "texmathp.el" "multi-prompt.el" "tex-mik.el" \
+                                "font-latex.el" "tex-font.el" \
+                                "context.el" "context-en.el" "context-nl.el" \
+                                "tex-fold.el" "tex-jp.el" \
+                                "toolbar-x.el" "tex-bar.el" "bib-cite.el" \
+                                "tex-ispell.el" "latex-flymake.el"))) \
+    (update-file-autoloads "preview.el" nil autoload-file)) \
   (save-buffers-kill-emacs t))'

 # Files and directories excluded from distributed tar ball.
--8<---------------cut here---------------end--------------->8---

Running make still doesn't ignore the files and `loaddefs-generate'
rifles through all .el files.  What am I missing?

Best, Arash