From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 5 Jan 2008 16:10:26 +0000 (+0000)
Subject: (custom-deps, finder-data): Depend on autoloads instead of loaddefs.el.
X-Git-Tag: emacs-pretest-22.1.90~179
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b534ed79ad62889cf2aec8dffcb4e3fe790c2ec;p=emacs.git

(custom-deps, finder-data): Depend on autoloads instead of loaddefs.el.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27f4252195c..037ec689fd0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-2007-01-05  Glenn Morris  <rgm@gnu.org>
+2008-01-05  Eli Zaretskii  <eliz@gnu.org>
+
+	* Makefile.in (custom-deps, finder-data): Depend on autoloads
+	instead of loaddefs.el.
+
+2008-01-05  Glenn Morris  <rgm@gnu.org>
 
 	* progmodes/verilog-mode.el: Replace all instances of
 	string-to-int with string-to-number, insert-string with insert,
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 59a81d7799d..d59ba38db9e 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -87,12 +87,16 @@ doit:
 
 $(lisp)/cus-load.el:
 	touch $@
-custom-deps: $(lisp)/subdirs.el $(lisp)/loaddefs.el $(lisp)/cus-load.el doit
+# Note that custom-deps and finder-data depend on autoloads rather
+# than on loaddefs.el, so that autoloads does not run in parallel with
+# them under "make -j", because that could delete loaddefs.el from
+# under their feet.
+custom-deps: $(lisp)/subdirs.el autoloads $(lisp)/cus-load.el doit
 	wd=$(lisp); $(setwins_almost); \
 	echo Directories: $$wins; \
 	$(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins
 
-finder-data: $(lisp)/subdirs.el $(lisp)/loaddefs.el doit
+finder-data: $(lisp)/subdirs.el autoloads doit
 	wd=$(lisp); $(setwins_almost); \
 	echo Directories: $$wins; \
 	$(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins