X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/ab5796a9f97180707734a81320e3eb81937281fe..f3725983e7c2abb2ad12e9509a34adbc0e2cfe0a:/lisp/makefile.w32-in diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index e7f020e33b..31e3144237 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -1,5 +1,6 @@ -# Makefile for GNU Emacs on the Microsoft W32 API. -# Copyright (c) 2000-2001 Free Software Foundation, Inc. +# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. +# Copyright (C) 2000, 2001, 2002, 2003, 2004, +# 2005 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -15,8 +16,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # ALL = @@ -46,75 +47,6 @@ lisptagsfiles1 = $(lisp)/*.el lisptagsfiles2 = $(lisp)/*/*.el ETAGS = "../lib-src/$(BLD)/etags" -# Files which should not be compiled. If you change the name `DONTCOMPILE' -# to something different, you'll have to change make-dist as well, and -# modify the lists in $lisp and $shortlisp on src/Makefile.in. -# -# - emacs-lisp/cl-specs.el: only contains `def-edebug-spec's so there's -# no point compiling it, although it doesn't hurt. - -DONTCOMPILE = \ - $(lisp)/cus-load.el \ - $(lisp)/emacs-lisp/cl-specs.el \ - $(lisp)/eshell/esh-maint.el \ - $(lisp)/eshell/esh-groups.el \ - $(lisp)/finder-inf.el \ - $(lisp)/forms-d2.el \ - $(lisp)/forms-pass.el \ - $(lisp)/generic-x.el \ - $(lisp)/international/latin-1.el \ - $(lisp)/international/latin-2.el \ - $(lisp)/international/latin-3.el \ - $(lisp)/international/latin-4.el \ - $(lisp)/international/latin-5.el \ - $(lisp)/international/latin-8.el \ - $(lisp)/international/latin-9.el \ - $(lisp)/international/mule-conf.el \ - $(lisp)/language/czech.el \ - $(lisp)/language/devanagari.el \ - $(lisp)/language/malayalam.el \ - $(lisp)/language/tamil.el \ - $(lisp)/language/english.el \ - $(lisp)/language/greek.el \ - $(lisp)/language/hebrew.el \ - $(lisp)/language/japanese.el \ - $(lisp)/language/korean.el \ - $(lisp)/language/lao.el \ - $(lisp)/language/misc-lang.el \ - $(lisp)/language/romanian.el \ - $(lisp)/language/slovak.el \ - $(lisp)/language/thai.el \ - $(lisp)/language/utf-8-lang.el \ - $(lisp)/language/georgian.el \ - $(lisp)/loaddefs.el \ - $(lisp)/loadup.el \ - $(lisp)/mail/blessmail.el \ - $(lisp)/patcomp.el \ - $(lisp)/paths.el \ - $(lisp)/play/bruce.el \ - $(lisp)/subdirs.el \ - $(lisp)/term/internal.el \ - $(lisp)/term/AT386.el \ - $(lisp)/term/apollo.el \ - $(lisp)/term/bobcat.el \ - $(lisp)/term/iris-ansi.el \ - $(lisp)/term/keyswap.el \ - $(lisp)/term/linux.el \ - $(lisp)/term/lk201.el \ - $(lisp)/term/news.el \ - $(lisp)/term/vt102.el \ - $(lisp)/term/vt125.el \ - $(lisp)/term/vt200.el \ - $(lisp)/term/vt201.el \ - $(lisp)/term/vt220.el \ - $(lisp)/term/vt240.el \ - $(lisp)/term/vt300.el \ - $(lisp)/term/vt320.el \ - $(lisp)/term/vt400.el \ - $(lisp)/term/vt420.el \ - $(lisp)/term/wyse50.el \ - $(lisp)/version.el - # Files to compile before others during a bootstrap. This is done to # speed up the bootstrap process. The CC files are compiled first # because CC mode tweaks the compilation process, and requiring @@ -159,21 +91,21 @@ WINS=\ progmodes \ term \ textmodes \ - toolbar + url doit: -cus-load.el: +$(lisp)/cus-load.el: touch $@ -custom-deps: cus-load.el doit +custom-deps: $(lisp)/cus-load.el doit @echo Directories: $(WINS) - -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hooks nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS) + -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS) finder-data: doit @echo Directories: $(WINS) $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS) -loaddefs.el: +$(lisp)/loaddefs.el: $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE) cp loaddefs.el-$(SHELLTYPE) $@ rm loaddefs.el-$(SHELLTYPE) @@ -214,28 +146,32 @@ loaddefs.el-CMD: echo ;;; End:>> $@ echo ;;; loaddefs.el ends here>> $@ -autoloads: loaddefs.el doit - @echo Directories: $(WINS) +# Use . instead of $(lisp) because $(lisp) is an absolute file name, +# including a drive letter and any leading directories, so the generated +# loaddefs.el will mention file names that on other machine reference +# possibly non-existent directories. +autoloads: $(lisp)/loaddefs.el doit + @echo Directories: . $(WINS) $(emacs) -l autoload \ - --eval $(ARGQUOTE)(setq find-file-hooks nil \ + --eval $(ARGQUOTE)(setq find-file-hook nil \ find-file-suppress-same-file-warnings t \ generated-autoload-file \ $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \ - -f batch-update-autoloads $(lisp) $(WINS) + -f batch-update-autoloads . $(WINS) -subdirs.el: +$(lisp)/subdirs.el: $(MAKE) $(MFLAGS) update-subdirs # Need separate version for sh and native cmd.exe update-subdirs: update-subdirs-$(SHELLTYPE) update-subdirs-CMD: doit - echo ;; -*- no-byte-compile: t -*->subdirs.el - echo ;; In load-path, after this directory should come>> subdirs.el - echo ;; certain of its subdirectories. Here we specify them.>> subdirs.el - echo (normal-top-level-add-to-load-path $(SQUOTE)(>> subdirs.el - @for %d in ($(WINS)) do if not (%d)==(term) echo "%d">> subdirs.el - echo ))>> subdirs.el + echo ;; -*- no-byte-compile: t -*-> $(lisp)/subdirs.el + echo ;; In load-path, after this directory should come>> $(lisp)/subdirs.el + echo ;; certain of its subdirectories. Here we specify them.>> $(lisp)/subdirs.el + echo (normal-top-level-add-to-load-path $(SQUOTE)(>> $(lisp)/subdirs.el + @for %%d in ($(WINS)) do if not (%%d)==(term) echo "%%d">> $(lisp)/subdirs.el + echo ))>> $(lisp)/subdirs.el update-subdirs-SH: doit $(srcdir)/update-subdirs $(lisp); \ @@ -243,12 +179,12 @@ update-subdirs-SH: doit $(srcdir)/update-subdirs $$file; \ done; -updates: update-subdirs autoloads finder-data custom-deps +updates: update-subdirs autoloads mh-autoloads finder-data custom-deps # Update the AUTHORS file. update-authors: - $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir) + $(emacs) -l authors -f batch-update-authors $(srcdir)/AUTHORS $(srcdir) TAGS: $(lisptagsfiles1) $(lisptagsfiles2) $(ETAGS) $(lisptagsfiles1) $(lisptagsfiles2) @@ -261,29 +197,27 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2) .el.elc: -$(emacs) -f batch-byte-compile $< -$(DONTCOMPILE:.el=.elc): - -$(DEL) $@ +# Compile all Lisp files, but don't recompile those that are up to +# date. Some files don't actually get compiled because they set the +# local variable no-byte-compile. -# Compile all Lisp files, except those from DONTCOMPILE, -# but don't recompile those that are up to date. - -# All .elc files are made writable -# before compilation in case we checked out read-only (CVS option -r). -# Files MUST be compiled one by one. If we compile several files in a -# row we can't make sure that the compilation environment is clean. -# We also set the load-path of the Emacs used for compilation to the -# current directory and its subdirectories, to make sure require's and -# load's in the files being compiled find the right files. +# All .elc files are made writable before compilation in case we +# checked out read-only (CVS option -r). Files MUST be compiled one by +# one. If we compile several files in a row we can't make sure that +# the compilation environment is clean. We also set the load-path of +# the Emacs used for compilation to the current directory and its +# subdirectories, to make sure require's and load's in the files being +# compiled find the right files. # Need separate version for sh and native cmd.exe -compile: subdirs.el compile-$(SHELLTYPE) doit +compile: $(lisp)/subdirs.el mh-autoloads compile-$(SHELLTYPE) doit compile-CMD: -# -for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @attrib -r %g - for %f in ($(COMPILE_FIRST)) do \ - $(emacs) -l loaddefs -f batch-byte-compile-if-not-done %f - for %f in (. $(WINS)) do for %g in (%f/*.el) do \ - $(emacs) -l loaddefs -f batch-byte-compile-if-not-done %f/%g +# -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g + for %%f in ($(COMPILE_FIRST)) do \ + $(emacs) -l loaddefs -f batch-byte-compile-if-not-done %%f + for %%f in (. $(WINS)) do for %%g in (%%f/*.el) do \ + $(emacs) -l loaddefs -f batch-byte-compile-if-not-done %%f/%%g compile-SH: # for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done @@ -301,14 +235,16 @@ compile-SH: done; \ done -# Compile all Lisp files, except those from DONTCOMPILE. This -# is like `compile' but compiles files unconditionally. -compile-always: subdirs.el compile-always-$(SHELLTYPE) doit +# Compile all Lisp files. This is like `compile' but compiles files +# unconditionally. Some files don't actually get compiled because they +# set the local variable no-byte-compile. + +compile-always: $(lisp)/subdirs.el compile-always-$(SHELLTYPE) doit compile-always-CMD: -# -for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @attrib -r %g - for %f in ($(COMPILE_FIRST)) do $(emacs) -f batch-byte-compile %f - for %f in (. $(WINS)) do for %g in (%f/*.el) do $(emacs) -f batch-byte-compile %f/%g +# -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g + for %%f in ($(COMPILE_FIRST)) do $(emacs) -f batch-byte-compile %%f + for %%f in (. $(WINS)) do for %%g in (%%f/*.el) do $(emacs) -f batch-byte-compile %%f/%%g compile-always-SH: # for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done @@ -326,7 +262,7 @@ compile-always-SH: compile-calc: compile-calc-$(SHELLTYPE) compile-calc-CMD: - for %f in ($(lisp)/calc/*.el) do $(emacs) -f batch-byte-compile %f + for %%f in ($(lisp)/calc/*.el) do $(emacs) -f batch-byte-compile %%f compile-calc-SH: for el in $(lisp)/calc/*.el; do \ @@ -349,30 +285,104 @@ compile-after-backup: backup-compiled-files compile-always # Note that this doesn't create .elc files. It only recompiles if an # .elc is present. -recompile: doit +recompile: mh-autoloads doit $(emacs) -f batch-byte-recompile-directory $(lisp) -# Prepare a bootstrap in the lisp subdirectory. Build loaddefs.el, -# because it's not sure it's up-to-date, and if it's not, that might -# lead to errors during the bootstrap because something fails to -# autoload as expected. Remove compiled Lisp files so that -# bootstrap-emacs will be built from sources only. +# Update MH-E internal autoloads. These are not to be confused with +# the autoloads for the MH-E entry points, which are already in +# loaddefs.el. +MH_E_SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el \ + $(lisp)/mh-e/mh-comp.el $(lisp)/mh-e/mh-customize.el \ + $(lisp)/mh-e/mh-e.el $(lisp)/mh-e/mh-funcs.el \ + $(lisp)/mh-e/mh-mime.el $(lisp)/mh-e/mh-pick.el \ + $(lisp)/mh-e/mh-print.el $(lisp)/mh-e/mh-inc.el \ + $(lisp)/mh-e/mh-init.el $(lisp)/mh-e/mh-index.el \ + $(lisp)/mh-e/mh-identity.el $(lisp)/mh-e/mh-junk.el \ + $(lisp)/mh-e/mh-seq.el $(lisp)/mh-e/mh-speed.el \ + $(lisp)/mh-e/mh-utils.el + +mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el +$(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC) + $(MAKE) $(MFLAGS) pre-mh-loaddefs.el-$(SHELLTYPE) + cp pre-mh-loaddefs.el-$(SHELLTYPE) $@ + rm pre-mh-loaddefs.el-$(SHELLTYPE) + $(EMACS) $(EMACSOPT) \ + -l autoload \ + --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ + --eval "(setq generated-autoload-file \"$(lisp)/mh-e/mh-loaddefs.el\")" \ + --eval "(setq find-file-suppress-same-file-warnings t)" \ + --eval "(setq make-backup-files nil)" \ + -f batch-update-autoloads $(lisp)/mh-e + +pre-mh-loaddefs.el-SH: + echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@ + echo ";;" >> $@ + echo ";;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc." >> $@ + echo ";;; Author: Bill Wohler " >> $@ + echo ";;; Keywords: mail" >> $@ + echo ";;; Commentary:" >> $@ + echo ";;; Change Log:" >> $@ + echo ";;; Code:" >> $@ + echo " " >> $@ + echo "(provide 'mh-loaddefs)" >> $@ + echo ";;; Local Variables:" >> $@ + echo ";;; version-control: never" >> $@ + echo ";;; no-byte-compile: t" >> $@ + echo ";;; no-update-autoloads: t" >> $@ + echo ";;; End:" >> $@ + echo ";;; mh-loaddefs.el ends here" >> $@ + +pre-mh-loaddefs.el-CMD: + echo ;;; mh-loaddefs.el --- automatically extracted autoloads> $@ + echo ;;>> $@ + echo ;;; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.>> $@ + echo ;;; Author: Bill Wohler (wohler@newt.com)>> $@ + echo ;;; Keywords: mail>> $@ + echo ;;; Commentary:>> $@ + echo ;;; Change Log:>> $@ + echo ;;; Code:>> $@ + echo. >> $@ + echo (provide 'mh-loaddefs)>> $@ + echo ;;; Local Variables:>> $@ + echo ;;; version-control: never>> $@ + echo ;;; no-byte-compile: t>> $@ + echo ;;; no-update-autoloads: t>> $@ + echo ;;; End:>> $@ + echo ;;; mh-loaddefs.el ends here>> $@ + +# Prepare a bootstrap in the lisp subdirectory. +# +# Build loaddefs.el to make sure it's up-to-date. If it's not, that +# might lead to errors during the bootstrap because something fails to +# autoload as expected. If there is no emacs binary, then we can't +# build autoloads yet. In that case we have to use ldefs-boot.el; +# bootstrap should always work with ldefs-boot.el. (Because +# loaddefs.el is an automatically generated file, we don't want to +# store it in the source repository). +# +# Remove compiled Lisp files so that bootstrap-emacs will be built from +# sources only. # Need separate version for sh and native cmd.exe -bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el +bootstrap-clean: bootstrap-clean-$(SHELLTYPE) $(lisp)/loaddefs.el bootstrap-clean-CMD: # if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads - -for %f in (. $(WINS)) do for %g in (%f\*.elc) do @$(DEL) %g + cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el + -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g bootstrap-clean-SH: # if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc + cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el -for dir in . $(WINS); do rm -f $$dir/*.elc; done # Generate/update files for the bootstrap process. +# When done, remove bootstrap-emacs from ../bin, so that +# it will not be mistaken for an installed binary. -bootstrap: update-subdirs autoloads compile finder-data custom-deps +bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps + - $(DEL) $(EMACS) # # Assuming INSTALL_DIR is defined, copy the elisp files to it @@ -406,5 +416,3 @@ install: # clean: - $(DEL) *~ - -# arch-tag: bd03b562-c58d-4403-99db-c7bccd8c49a0