[Emacs-diffs] Changes to emacs/lisp/makefile.w32-in [emacs-unicode-2]

[Jason Rumney]

Index: emacs/lisp/makefile.w32-in
diff -c /dev/null emacs/lisp/makefile.w32-in:1.30.6.1
*** /dev/null   Sat Oct 11 19:28:24 2003
--- emacs/lisp/makefile.w32-in  Sat Oct 11 19:28:23 2003
***************
*** 0 ****
--- 1,409 ----
+ #  Makefile for GNU Emacs on the Microsoft W32 API.
+ #  Copyright (c) 2000-2001 Free Software Foundation, Inc.
+ #
+ #  This file is part of GNU Emacs.
+ #
+ #  GNU Emacs is free software; you can redistribute it and/or modify
+ #  it under the terms of the GNU General Public License as published by
+ #  the Free Software Foundation; either version 2, or (at your option)
+ #  any later version.
+ #
+ #  GNU Emacs is distributed in the hope that it will be useful,
+ #  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #  GNU General Public License for more details.
+ #
+ #  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.
+ #
+ 
+ ALL =
+ 
+ all: $(ALL)
+ 
+ SQUOTE='
+ # '
+ 
+ lisp = $(CURDIR)
+ srcdir = $(CURDIR)/..
+ 
+ # You can specify a different executable on the make command line,
+ # e.g. "make EMACS=../src/emacs ...".
+ 
+ EMACS = "$(THISDIR)/../bin/emacs.exe"
+ 
+ # Command line flags for Emacs.  This must include --multibyte,
+ # otherwise some files will not compile.
+ 
+ EMACSOPT = -batch --no-init-file --no-site-file --multibyte
+ 
+ # Set EMACSLOADPATH correctly (already defined in environment).
+ EMACSLOADPATH=$(lisp)
+ 
+ # Use C locale
+ LC_ALL = C
+ 
+ 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/latin1-disp.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)/language/vietnamese.el \
+       $(lisp)/language/cyrillic.el \
+       $(lisp)/language/chinese.el \
+       $(lisp)/language/indian.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
+ # cc-mode when it is not compiled doesn't work during the
+ # bootstrapping.
+ 
+ COMPILE_FIRST = \
+       $(lisp)/emacs-lisp/byte-opt.el \
+       $(lisp)/emacs-lisp/bytecomp.el \
+       $(lisp)/subr.el \
+       $(lisp)/progmodes/cc-mode.el \
+       $(lisp)/progmodes/cc-vars.el
+ 
+ # The actual Emacs command run in the targets below.
+ 
+ emacs = $(EMACS) $(EMACSOPT)
+ 
+ # Common command to find subdirectories
+ 
+ setwins=subdirs=`find $$wd -type d -print`; \
+       for file in $$subdirs; do \
+          case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \
+               *) wins="$$wins $$file" ;; \
+          esac; \
+         done
+ 
+ # Have to define the list of subdirs manually when not using sh.
+ WINS=\
+       calc \
+       calendar \
+       emacs-lisp \
+       emulation \
+       eshell \
+       gnus \
+       international \
+       language \
+       mail \
+       mh-e \
+       net \
+       obsolete \
+       play \
+       progmodes \
+       term \
+       textmodes \
+       toolbar
+ 
+ doit:
+ 
+ cus-load.el:
+       touch $@
+ custom-deps: 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)
+ 
+ finder-data: doit
+       @echo Directories: $(WINS)
+       $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS)
+ 
+ loaddefs.el:
+       $(MAKE) $(MFLAGS) loaddefs.el-$(SHELLTYPE)
+       cp loaddefs.el-$(SHELLTYPE) $@
+       rm loaddefs.el-$(SHELLTYPE)
+ 
+ loaddefs.el-SH:
+       echo ";;; loaddefs.el --- automatically extracted autoloads" > $@
+       echo ";;" >> $@; echo ";;; Code:" >> $@
+       echo "(autoload 'define-minor-mode \"easy-mmode\")" >>$@
+       echo "(autoload 'define-ccl-program \"ccl\")" >>$@
+       echo "(autoload 'regexp-opt \"regexp-opt\")" >>$@
+       echo "(autoload 'string-to-list \"mule-util\")" >>$@
+       echo "(autoload 'define-derived-mode \"derived\")" >>$@
+       echo "(autoload 'encoded-kbd-mode \"encoded-kb\")" >>$@
+       echo "(defvar cvs-global-menu nil)" >>$@
+       echo "" >> $@
+       echo ";;; Local Variables:" >> $@
+       echo ";;; version-control: never" >> $@
+       echo ";;; no-byte-compile: t" >> $@
+       echo ";;; no-update-autoloads: t" >> $@
+       echo ";;; End:" >> $@
+       echo ";;; loaddefs.el ends here" >> $@
+ 
+ loaddefs.el-CMD:
+       echo ;;; loaddefs.el --- automatically extracted autoloads> $@
+       echo ;;; Code:>> $@
+       echo (autoload 'define-minor-mode "easy-mmode")>> $@
+       echo (autoload 'define-ccl-program "ccl")>> $@
+       echo (autoload 'regexp-opt "regexp-opt")>> $@
+       echo (autoload 'string-to-list "mule-util")>> $@
+       echo (autoload 'define-derived-mode "derived")>> $@
+       echo (autoload 'encoded-kbd-mode "encoded-kb")>> $@
+       echo (defvar cvs-global-menu nil)>> $@
+       echo.>> $@
+       echo ;;; Local Variables:>> $@
+       echo ;;; version-control: never>> $@
+       echo ;;; no-byte-compile: t>> $@
+       echo ;;; no-update-autoloads: t>> $@
+       echo ;;; End:>> $@
+       echo ;;; loaddefs.el ends here>> $@
+ 
+ autoloads: loaddefs.el doit
+       @echo Directories: $(WINS)
+       $(emacs) -l autoload \
+               --eval $(ARGQUOTE)(setq find-file-hooks nil \
+                       find-file-suppress-same-file-warnings t \
+                       generated-autoload-file \
+                         $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) \
+               -f batch-update-autoloads $(lisp) $(WINS)
+ 
+ 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
+ 
+ update-subdirs-SH: doit
+       $(srcdir)/update-subdirs $(lisp); \
+       for file in $(WINS); do \
+          $(srcdir)/update-subdirs $$file; \
+       done;
+ 
+ updates: update-subdirs autoloads finder-data custom-deps
+ 
+ # Update the AUTHORS file.
+ 
+ update-authors:
+       $(emacs) -f batch-update-authors $(srcdir)/AUTHORS $(srcdir)
+ 
+ TAGS: $(lisptagsfiles1) $(lisptagsfiles2)
+       $(ETAGS) $(lisptagsfiles1) $(lisptagsfiles2)
+ 
+ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
+       $(ETAGS) -o TAGS-LISP $(lisptagsfiles1) $(lisptagsfiles2)
+ 
+ .SUFFIXES: .elc .el
+ 
+ .el.elc:
+       -$(emacs) -f batch-byte-compile $<
+ 
+ $(DONTCOMPILE:.el=.elc):
+       -$(DEL) $@
+ 
+ # 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.
+ 
+ # Need separate version for sh and native cmd.exe
+ compile: subdirs.el 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
+ 
+ compile-SH:
+ #     for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done
+       for el in $(COMPILE_FIRST); do \
+         echo Compiling $$el; \
+         $(emacs) -l loaddefs -f batch-byte-compile-if-not-done $$el; \
+       done
+       for dir in $(lisp) $(WINS); do \
+         for el in $$dir/*.el; do \
+           if test -f $$el; \
+           then \
+             echo Compiling $$el; \
+             $(emacs) -l loaddefs -f batch-byte-compile-if-not-done $$el; \
+           fi \
+         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-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
+ 
+ compile-always-SH:
+ #     for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done
+       for el in $(COMPILE_FIRST); do \
+         echo Compiling $$el; \
+         $(emacs) -f batch-byte-compile $$el || exit 1; \
+       done
+       for dir in $(lisp) $(WINS); do \
+         for el in $$dir/*.el; do \
+           echo Compiling $$el; \
+           $(emacs) -f batch-byte-compile $$el || exit 1; \
+         done; \
+       done
+ 
+ compile-calc: compile-calc-$(SHELLTYPE)
+ 
+ compile-calc-CMD:
+       for %f in ($(lisp)/calc/*.el) do $(emacs) -f batch-byte-compile %f
+ 
+ compile-calc-SH:
+       for el in $(lisp)/calc/*.el; do \
+         echo Compiling $$el; \
+         $(emacs) -f batch-byte-compile $$el || exit 1; \
+       done
+ 
+ # Backup compiled Lisp files in elc.tar.gz.  If that file already
+ # exists, make a backup of it.
+ 
+ backup-compiled-files:
+       -mv $(lisp)/elc.tar.gz $(lisp)/elc.tar.gz~
+       -tar czf $(lisp)/elc.tar.gz $(lisp)/*.elc $(lisp)/*/*.elc
+ 
+ # Compile Lisp files, but save old compiled files first.
+ 
+ compile-after-backup: backup-compiled-files compile-always
+ 
+ # Recompile all Lisp files which are newer than their .elc files.
+ # Note that this doesn't create .elc files.  It only recompiles if an
+ # .elc is present.
+ 
+ recompile: 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.
+ 
+ # Need separate version for sh and native cmd.exe
+ bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el
+ 
+ bootstrap-clean-CMD:
+ #     if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
+       -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
+       -for dir in . $(WINS); do rm -f $$dir/*.elc; done
+ 
+ # Generate/update files for the bootstrap process.
+ 
+ bootstrap: update-subdirs autoloads compile finder-data custom-deps
+ 
+ #
+ # Assuming INSTALL_DIR is defined, copy the elisp files to it
+ # Windows 95 makes this harder than it should be.
+ #
+ install:
+               - mkdir "$(INSTALL_DIR)/lisp"
+               - $(DEL) ../same-dir.tst
+               - $(DEL) "$(INSTALL_DIR)/same-dir.tst"
+               echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
+ #ifdef COPY_LISP_SOURCE
+               $(IFNOTSAMEDIR) $(CP_DIR) . "$(INSTALL_DIR)/lisp" $(ENDIF)
+ #else
+ #             $(IFNOTSAMEDIR) $(CP_DIR) *.elc "$(INSTALL_DIR)/lisp" $(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) cus-load.el "$(INSTALL_DIR)/lisp" $(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) forms*.el "$(INSTALL_DIR)/lisp" $(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) patcomp.el "$(INSTALL_DIR)/lisp" $(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) subdirs.el "$(INSTALL_DIR)/lisp" $(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) version.el "$(INSTALL_DIR)/lisp" $(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) mail/blessmail.el 
"$(INSTALL_DIR)/lisp/mail" $(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) mail/sc.el "$(INSTALL_DIR)/lisp/mail" 
$(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) play/bruce.el "$(INSTALL_DIR)/lisp/play" 
$(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) international/latin-*.el 
"$(INSTALL_DIR)/lisp/international" $(ENDIF)
+ #             $(IFNOTSAMEDIR) $(CP) international/mule-conf.el 
"$(INSTALL_DIR)/lisp/international" $(ENDIF)
+ #endif
+               - $(DEL) ../same-dir.tst
+               - $(DEL) "$(INSTALL_DIR)/same-dir.tst"
+ 
+ #
+ # Maintenance
+ #
+ clean:
+               - $(DEL) *~