diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2009-10-07 09:31:32 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2009-10-07 09:31:32 +0000 |
| commit | 8c4afe20dfec48f260319c2cb0919c511a14920f (patch) | |
| tree | a57daaad025dbb85b1c5be779853072ed0f3d975 /lisp/makefile.w32-in | |
| parent | ee2e93e2c23dc195c81a8c1127e8945a651c9485 (diff) | |
| download | emacs-8c4afe20dfec48f260319c2cb0919c511a14920f.tar.gz | |
* makefile.w32-in (WINS_UPDATES): New macro.
(custom-deps, finder-data, autoloads): Use it.
Diffstat (limited to 'lisp/makefile.w32-in')
| -rw-r--r-- | lisp/makefile.w32-in | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index ed1b8906fec..591678d5127 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -118,12 +118,19 @@ WINS_BASIC=\ 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 @@ $(lisp)/cus-load.el: # 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 @@ loaddefs.el-CMD: # 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-CMD: 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 |