* mouse.el (mouse-drag-track): Deactivate the mark before popping.

[gnu-emacs] / lisp / makefile.w32-in

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index ed2fe4031b71ba21e592055336faee2060c98ac2..2137607281ac5805290e62c805d150614f0d2c99 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -1,5 +1,5 @@
 # -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000-2011  Free Software Foundation, Inc.
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -27,9 +27,9 @@ lisp = $(CURDIR)
 srcdir = $(CURDIR)/..
 
 # You can specify a different executable on the make command line,
-# e.g. "make EMACS=../src/emacs ...".
+# e.g. "make EMACS=../bin/emacs ...".
 
-EMACS = $(THISDIR)/../bin/emacs.exe
+EMACS = ../src/$(BLD)/emacs.exe
 
 # Command line flags for Emacs.
 
@@ -70,25 +70,20 @@ AUTOGENEL = $(lisp)/loaddefs.el $(LOADDEFS) $(lisp)/cus-load.el \
 # During bootstrapping the byte-compiler is run interpreted when compiling
 # itself, and uses more stack than usual.
 #
-BIG_STACK_DEPTH = 1200
+BIG_STACK_DEPTH = 2200
 BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))"
 
 BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS)
 
 # 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.
+# speed up the bootstrap process.
 
 COMPILE_FIRST = \
-       $(lisp)/emacs-lisp/byte-opt.el \
        $(lisp)/emacs-lisp/bytecomp.el \
+       $(lisp)/emacs-lisp/byte-opt.el \
        $(lisp)/emacs-lisp/macroexp.el \
        $(lisp)/emacs-lisp/cconv.el \
-       $(lisp)/subr.el \
-       $(lisp)/progmodes/cc-mode.el \
-       $(lisp)/progmodes/cc-vars.el
+       $(lisp)/emacs-lisp/autoload.el
 
 # The actual Emacs command run in the targets below.
 # The quotes around $(EMACS) are here because the user could type
@@ -232,17 +227,20 @@ $(lisp)/subdirs.el:
 update-subdirs: update-subdirs-$(SHELLTYPE)
 
 update-subdirs-CMD: doit
-       echo ;; -*- no-byte-compile: t -*-> $(lisp)/subdirs.el
-       echo ;; In load-path, after this directory should come>> $(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_SUBDIR) cedet) do echo "%%d">> $(lisp)/subdirs.el
        echo ))>> $(lisp)/subdirs.el
+       echo ;; Local Variables:>> $(lisp)/subdirs.el
+       echo ;; version-control: never>> $(lisp)/subdirs.el
+       echo ;; no-byte-compile: t>> $(lisp)/subdirs.el
+       echo ;; End:>> $(lisp)/subdirs.el
 
 update-subdirs-SH: doit
-       $(srcdir)/update-subdirs $(lisp); \
+       $(srcdir)/build-aux/update-subdirs $(lisp); \
        for file in $(WINS_SUBDIR); do \
-          $(srcdir)/update-subdirs $$file; \
+          $(srcdir)/build-aux/update-subdirs $$file; \
        done;
 
 updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
@@ -313,16 +311,16 @@ TAGS-LISP-CMD: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsf
 # compiled find the right files.
 
 # Need separate version for sh and native cmd.exe
-compile: $(lisp)/subdirs.el mh-autoloads compile-$(SHELLTYPE) doit
+compile: $(lisp)/subdirs.el compile-$(SHELLTYPE) doit
 
-compile-CMD:
+compile-CMD: autoloads
 #      -for %%f in ($(lisp) $(WINS)) do for %%g in (%%f\*.elc) do @attrib -r %%g
        for %%f in ($(COMPILE_FIRST)) do \
          $(emacs) -l loaddefs $(BYTE_COMPILE_FLAGS) -f batch-byte-compile-if-not-done %%f
        for %%f in (. $(WINS)) do for %%g in (%%f/*.el) do \
          $(emacs) -l loaddefs $(BYTE_COMPILE_FLAGS) -f batch-byte-compile-if-not-done %%f/%%g
 
-compile-SH:
+compile-SH: autoloads
 #      for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done
        for el in $(COMPILE_FIRST); do \
          echo Compiling $$el; \
@@ -498,7 +496,7 @@ bootstrap-clean-SH:
 # When done, remove bootstrap-emacs from ../bin, so that
 # it will not be mistaken for an installed binary.
 
-bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps
+bootstrap: update-subdirs compile finder-data custom-deps
        - $(DEL) "$(EMACS)"
 
 #
@@ -507,9 +505,9 @@ bootstrap: update-subdirs autoloads mh-autoloads compile finder-data custom-deps
 #
 install:
                - mkdir "$(INSTALL_DIR)/lisp"
-               - $(DEL) ../same-dir.tst
-               - $(DEL) "$(INSTALL_DIR)/same-dir.tst"
-               echo SameDirTest > "$(INSTALL_DIR)/same-dir.tst"
+               - $(DEL) ../$(DIRNAME)_same-dir.tst
+               - $(DEL) "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
+               echo SameDirTest > "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
 #ifdef COPY_LISP_SOURCE
                $(IFNOTSAMEDIR) $(MAKE) $(MFLAGS) install-lisp-$(SHELLTYPE) $(ENDIF)
 #else
@@ -525,8 +523,8 @@ install:
 #              $(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"
+               - $(DEL) ../$(DIRNAME)_same-dir.tst
+               - $(DEL) "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst"
 
 # Need to copy *.el files first, to avoid "source file is newer" annoyance
 # since cp does not preserve time stamps