Mercurial > emacs
changeset 105503:33c51c8b86b5
* makefile.w32-in (WINS_UPDATES): New macro.
(custom-deps, finder-data, autoloads): Use it.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Wed, 07 Oct 2009 09:31:32 +0000 |
| parents | 7f17857bf0eb |
| children | a4b36898ee9a |
| files | lisp/ChangeLog lisp/makefile.w32-in |
| diffstat | 2 files changed, 20 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Oct 07 07:19:07 2009 +0000 +++ b/lisp/ChangeLog Wed Oct 07 09:31:32 2009 +0000 @@ -1,3 +1,8 @@ +2009-10-07 Juanma Barranquero <lekktu@gmail.com> + + * makefile.w32-in (WINS_UPDATES): New macro. + (custom-deps, finder-data, autoloads): Use it. + 2009-10-07 Glenn Morris <rgm@gnu.org> * Makefile.in (autoloads): Revert previous change.
--- a/lisp/makefile.w32-in Wed Oct 07 07:19:07 2009 +0000 +++ b/lisp/makefile.w32-in Wed Oct 07 09:31:32 2009 +0000 @@ -118,12 +118,19 @@ textmodes \ url +# Directories with lisp files to compile WINS_ALMOST=$(WINS_BASIC) \ $(WINS_CEDET) +# Directories to extract data from (customs, autoloads, etc.) +WINS_UPDATES=$(WIN_ALMOST) \ + $(WINS_CEDET_SUBDIRS) + +# Directories to add to subdirs.el WINS_SUBDIR=$(WINS_BASIC) \ obsolete +# All directories, except CEDET subdirs WINS= $(WINS_ALMOST) \ term \ obsolete @@ -158,12 +165,13 @@ # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as # this can break with GNU Make 3.81 and later if sh.exe is used. custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit - @echo Directories: $(WINS_ALMOST) - -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS_ALMOST) + @echo Directories: $(WINS_UPDATES) + -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) \ + -f custom-make-dependencies $(lisp) $(WINS_UPDATES) finder-data: $(lisp)/loaddefs.el doit - @echo Directories: $(WINS_ALMOST) - $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS_ALMOST) + @echo Directories: $(WINS_UPDATES) + $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS_UPDATES) $(lisp)/loaddefs.el: $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE) @@ -203,10 +211,10 @@ # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as # this can break with GNU Make 3.81 and later if sh.exe is used. autoloads: $(lisp)/loaddefs.el $(LOADDEFS) doit - @echo Directories: . $(WINS_ALMOST) + @echo Directories: . $(WINS_UPDATES) $(emacs) -l autoload \ --eval $(ARGQUOTE)(setq find-file-hook nil find-file-suppress-same-file-warnings t)$(ARGQUOTE) \ - -f w32-batch-update-autoloads "$(lisp)/loaddefs.el" . $(WINS_ALMOST) + -f w32-batch-update-autoloads "$(lisp)/loaddefs.el" . $(WINS_UPDATES) $(lisp)/subdirs.el: $(MAKE) $(MFLAGS) update-subdirs @@ -423,7 +431,7 @@ bootstrap-clean-SH: # if test -f "$(EMACS)"; then $(MAKE) $(MFLAGS) autoloads; fi # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc - -for dir in . $(WINS) $(WINS_CEDET_SUBDIRS); do rm -f $$dir/*.elc $$dir/*/*.elc $$dir/*/*/*.elc; done + -for dir in . $(WINS) $(WINS_CEDET_SUBDIRS); do rm -f $$dir/*.elc $$dir/*/*.elc $$dir/*/*/*.elc; done # Generate/update files for the bootstrap process. # When done, remove bootstrap-emacs from ../bin, so that