*** empty log message ***

[bpt/emacs.git] / lisp / makefile.w32-in

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index ebe79c1..83b4cf8 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -1,6 +1,5 @@
-#  Hacked up Nmake makefile for GNU Emacs
-#   Geoff Voelker (voelker@cs.washington.edu)
-#  Copyright (c) 1994 Free Software Foundation, Inc.
+#  Makefile for GNU Emacs on the Microsoft W32 API.
+#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #  
@@ -27,19 +26,21 @@ all: $(ALL)
 SQUOTE='
 # '
 
-#lisp=$(MAKEDIR:\=/)
-lisp=.
+lisp = $(CURDIR)
 
 # You can specify a different executable on the make command line,
 # e.g. "make EMACS=../src/emacs ...".
 
-EMACS = "../bin/emacs.exe"
+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)
+
 lisptagsfiles1 = $(lisp)/*.el
 lisptagsfiles2 = $(lisp)/*/*.el
 ETAGS = "../lib-src/$(BLD)/etags"
@@ -76,15 +77,40 @@ DONTCOMPILE = \
        $(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)/term/xterm.el \
        $(lisp)/version.el
 
-# Files to compile before others during a bootstrap.  This is done
-# to speed up the bootstrap process.
+# 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)/subr.el \
+       $(lisp)/progmodes/cc-mode.el \
+       $(lisp)/progmodes/cc-vars.el
 
 # The actual Emacs command run in the targets below.
 
@@ -121,7 +147,7 @@ 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)
+       -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hooks nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
 
 finder-inf.el:
        echo (provide $(SQUOTE)finder-inf)>> $@
@@ -143,8 +169,12 @@ loaddefs.el:
 
 autoloads: loaddefs.el doit
        @echo Directories: $(WINS)
-       set EMACSLOADPATH=$(lisp)
-       $(SETLOADPATH) $(emacs) -l autoload --eval $(ARGQUOTE)(setq find-file-hooks nil generated-autoload-file $(DQUOTE)$(lisp)/loaddefs.el$(DQUOTE))$(ARGQUOTE) -f batch-update-autoloads $(lisp) $(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
@@ -173,9 +203,10 @@ TAGS: $(lisptagsfiles1) $(lisptagsfiles2)
 TAGS-LISP: $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)
        $(ETAGS) -o TAGS-LISP $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2)
 
+.SUFFIXES: .elc .el
+
 .el.elc:
-       set EMACSLOADPATH=$(lisp)
-       -$(SETLOADPATH) $(emacs) -f batch-byte-compile $<
+       -$(emacs) -f batch-byte-compile $<
 
 $(DONTCOMPILE:.el=.elc):
        -$(DEL) $@
@@ -193,21 +224,20 @@ $(DONTCOMPILE:.el=.elc):
 compile-files: subdirs.el compile-files-$(SHELLTYPE) doit
 
 compile-files-CMD:
-       set EMACSLOADPATH=$(lisp)
 #      -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 ($(lisp) $(WINS)) do for %g in (%f/*.el) do $(emacs) -f batch-byte-compile %f/%g
+       for %f in (. $(WINS)) do for %g in (%f/*.el) do $(emacs) -f batch-byte-compile %f/%g
 
 compile-files-SH:
 #      for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done
        for el in $(COMPILE_FIRST); do \
          echo Compiling $$el; \
-         EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $$el; \
+         $(emacs) -f batch-byte-compile $$el; \
        done
        for dir in $(lisp) $(WINS); do \
          for el in $$dir/*.el; do \
            echo Compiling $$el; \
-           EMACSLOADPATH=$(lisp) $(emacs) -f batch-byte-compile $$el; \
+           $(emacs) -f batch-byte-compile $$el; \
          done; \
        done
 
@@ -227,8 +257,7 @@ compile: backup-compiled-files compile-files
 # .elc is present.
 
 recompile: doit
-       set EMACSLOADPATH=$(lisp)
-       $(SETLOADPATH) $(emacs) -f batch-byte-recompile-directory .
+       $(emacs) -f batch-byte-recompile-directory .
 
 # 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
@@ -241,7 +270,7 @@ bootstrap-clean: bootstrap-clean-$(SHELLTYPE)
 
 bootstrap-clean-CMD:
        if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads
-       -for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @$(DEL) %g
+       -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