aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2007-01-26 15:29:17 +0000
committerEli Zaretskii2007-01-26 15:29:17 +0000
commitf2133d9e8f7d7a25462dd127d4a614bfb1cbbaae (patch)
tree6a4d8a3b165ed572a6d2086031e0efb0b1ef5967
parent3fb8b536ddb9f41273b336a5a78a2a9063a8f8b7 (diff)
downloademacs-f2133d9e8f7d7a25462dd127d4a614bfb1cbbaae.tar.gz
emacs-f2133d9e8f7d7a25462dd127d4a614bfb1cbbaae.zip
(finder-data, custom-deps): Depend on $(lisp)/loaddefs.el.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/makefile.w32-in4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86666d5857a..0170c52c33a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-01-26 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (finder-data, custom-deps): Depend on
4 $(lisp)/loaddefs.el.
5
12007-01-24 Dan Nicolaescu <dann@ics.uci.edu> 62007-01-24 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * Makefile.in (custom-deps, finder-data): Add dependency to 8 * Makefile.in (custom-deps, finder-data): Add dependency to
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 61e7a358f49..e3ea090d652 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -96,11 +96,11 @@ $(lisp)/cus-load.el:
96 touch $@ 96 touch $@
97# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as 97# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
98# this can break with GNU Make 3.81 and later if sh.exe is used. 98# this can break with GNU Make 3.81 and later if sh.exe is used.
99custom-deps: $(lisp)/cus-load.el doit 99custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit
100 @echo Directories: $(WINS) 100 @echo Directories: $(WINS)
101 -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS) 101 -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
102 102
103finder-data: doit 103finder-data: $(lisp)/loaddefs.el doit
104 @echo Directories: $(WINS) 104 @echo Directories: $(WINS)
105 $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS) 105 $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS)
106 106