Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 563-582)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 177-185)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158

8 files changed, 177 insertions, 60 deletions

diff --git a/nt/.gitignore b/nt/.gitignore
index 26f5de661a0..cfa059286f2 100644
--- a/nt/.gitignore
+++ b/nt/.gitignore
@@ -5,3 +5,4 @@ config.log
 makefile
 obj
 oo
+stamp_BLD
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 7bb8528fd82..179efe7a8d4 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,65 @@
+2006-12-29  Jason Rumney  <jasonr@gnu.org>
+
+	* nmake.defs (TEMACS_EXTRA_LINK): Remove duplicated flags from
+	DEBUG_LINK.
+	(DEBUG_LINK): Remove -debugtype:both
+
+2006-12-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* INSTALL: Update table of supported Make ports.  Show "make -j"
+	command that is known to work.
+
+	* configure.bat: Update table of supported Make ports.
+
+2006-12-24  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in ($(TRES)): Don't use $<, as nmake supports it
+	only in implicit rules.  Use literal "emacs.rc" instead.
+
+2006-12-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* gmake.defs: Export XMFLAGS.
+
+	* makefile.w32-in (all-other-dirs-nmake, recompile-nmake): Don't
+	use $(XMFLAGS) for nmake, as it doesn't support parallelism.
+
+2006-12-22  Eli Zaretskii  <eliz@gnu.org>
+
+	* INSTALL: Explain how to invoke GNU Make for parallel builds.
+
+	* makefile.w32-in (bootstrap-gmake): Pass XMFLAGS="$(XMFLAGS)"
+	command-line argument to sub-Make in src, since src/makefile.w32-in
+	invokes Make recursively during bootstrap.
+	(clean): Delete stamp_BLD.
+	(bootstrap): Make `all' explicitly in a recursive Make.
+
+	* gmake.defs (stamp_BLD): Rename from $(BLD).  Create a file
+	stamp_BLD after creating the $(BLD) directory.
+
+	* nmake.defs (stamp_BLD): Rename from $(BLD).  Create a file
+	stamp_BLD after creating the $(BLD) directory.
+
+	* makefile.w32-in (addpm, ddeclient, cmdproxy, addsection)
+	(preprep, $(TRES), runemacs)
+	($(BLD)/addpm.$(O), $(BLD)/ddeclient.$(O), $(BLD)/runemacs.$(O))
+	($(BLD)/cmdproxy.$(O), (BLD)/addsection.$(O), $(BLD)/preprep.$(O)):
+	Depend on stamp_BLD instead of on $(BLD).
+	(XMFLAGS): New macro.
+	(all-other-dirs-nmake, all-other-dirs-gmake, recompile-nmake)
+	(recompile-gmake, bootstrap-gmake, bootstrap-clean-gmake)
+	(install-other-dirs-gmake, info-gmake, clean-other-dirs-gmake)
+	(cleanall-other-dirs-gmake): Pass $(XMFLAGS) to sub-Make.
+
+2006-12-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in ($(TRES)): Depend on $(BLD).  Use $< instead of
+	$(ALL_DEPS).
+	($(BLD)/addpm.$(O), $(BLD)/ddeclient.$(O), $(BLD)/runemacs.$(O)
+	($(BLD)/cmdproxy.$(O), $(BLD)/addsection.$(O), $(BLD)/preprep.$(O)):
+	New dependency on $(BLD).
+	(all-other-dirs-nmake, all-other-dirs-gmake, bootstrap-nmake)
+	(bootstrap-gmake): Depend on addsection.
+
 2006-10-29  Juanma Barranquero  <lekktu@gmail.com>
 
 	* runemacs.c (WinMain): Process all recognized arguments, not just
diff --git a/nt/INSTALL b/nt/INSTALL
index 8415b1893ff..9033153fcae 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -43,7 +43,18 @@
        gmake
 
      (If you are building from CVS, say "make bootstrap" or "nmake
-     bootstrap" instead and avoid using Cygwin make.)
+     bootstrap" instead, and avoid using Cygwin make.)
+
+     With GNU Make, you can use the -j command-line option to have
+     Make execute several commands at once, like this:
+
+       gmake -j 2 XMFLAGS="-j 2"
+
+     The XMFLAGS variable overrides the default behavior of GNU Make
+     on Windows, whereby recursive Make invocations reset the maximum
+     number of simultaneous commands to 1.  The above command allows
+     up to 4 simultaneous commands at once in the top-level Make, and
+     up to 3 in each one of the recursive Make's.
 
   4. Generate the Info manuals (only if you are building out of CVS, and
      if you have makeinfo.exe installed):
@@ -95,6 +106,9 @@
   build (latest versions of the Cygwin toolkit, at least since v1.3.3,
   include the MinGW headers and libraries as an integral part).
 
+  Note that building Emacs with Visual Studio 2005 is not supported at
+  this time.
+
   The rest of this file assumes you have a working development
   environment.  If you just installed  such an environment, try
   building a trivial C "Hello world" program, and see if it works.  If
@@ -132,7 +146,7 @@
     cygwin compiled make 3.80:           fails?[6]     fails?[6]
     cygwin compiled make 3.81:           fails         fails?[6]
     mingw32 compiled make 3.79.1:        okay          okay
-    mingw32 compiled make 3.80:          okay          unknown[6]
+    mingw32 compiled make 3.80:          okay          okay[6]
     mingw32 compiled make 3.81:          okay          okay[7]
 
   Notes:
@@ -145,7 +159,7 @@
     [4] may fail on Windows 9X and Windows ME; if so, install Bash.
     [5] fails when building leim due to the use of cygwin style paths.
         May work if building emacs without leim.
-    [6] please report if you try this combination.
+    [6] not recommended; please report if you try this combination.
     [7] tested only on Windows XP.
 
   Other compilers may work, but specific reports from people that have
@@ -252,6 +266,18 @@
   The warnings may be fixed in the main FSF source at some point, but
   until then we will just live with them.
 
+  With GNU Make, you can use the -j command-line option to have Make
+  execute several commands at once, like this:
+
+    gmake -j 4 XMFLAGS="-j 3"
+
+  The XMFLAGS variable overrides the default behavior of GNU Make on
+  Windows, whereby recursive Make invocations reset the maximum number
+  of simultaneous commands to 1.  The above command allows up to 4
+  simultaneous commands at once in the top-level Make, and up to 3 in
+  each one of the recursive Make's; you can use other numbers of jobs,
+  if you wish.
+
   If you are building from CVS, the following commands will produce
   the Info manuals (which are not part of the CVS repository):
 
diff --git a/nt/configure.bat b/nt/configure.bat
index ffc11542ce0..1e411e8ad2c 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -25,27 +25,38 @@ rem   YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS:
 rem

 rem   + MS Windows 95/98/Me or NT/2000/XP

 rem   + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75

-rem     or later) and the Mingw32 and W32 API headers and libraries

+rem     or later) and the Mingw32 and W32 API headers and libraries.

+rem   + Visual Studio 2005 is not supported at this time.

 rem

 rem For reference, here is a list of which builds of gmake are known to

 rem work or not, and whether they work in the presence and/or absence of

 rem sh.exe.

 rem

 rem                                       sh exists     no sh

-rem  cygwin b20.1 make (3.75):            okay[1]       fails[2]

+rem  cygwin b20.1 make (3.75):            fails[1,5]    fails[2,5]

 rem  MSVC compiled gmake 3.77:            okay          okay

 rem  MSVC compiled gmake 3.78.1:          okay          okay

 rem  MSVC compiled gmake 3.79.1:          okay          okay

-rem  mingw32/gcc-2.92.2 make (3.77):      okay          okay

-rem  cygwin compiled gmake 3.77:          okay[1]       fails[2]

-rem  cygwin compiled gmake 3.78.1:        okay          fails[2]

-rem  cygwin compiled gmake 3.79.1:        couldn't build make[3]

+rem  mingw32/gcc-2.92.2 make (3.77):      okay          okay[4]

+rem  cygwin compiled gmake 3.77:          fails[1,5]    fails[2,5]

+rem  cygwin compiled gmake 3.78.1:        fails[5]      fails[2,5]

+rem  cygwin compiled gmake 3.79.1:        fails[3,5]    fails[2?,5]

+rem  cygwin compiled make 3.80:           fails?[6]     fails?[6]

+rem  cygwin compiled make 3.81:           fails         fails?[6]

+rem  mingw32 compiled make 3.79.1:        okay          okay

+rem  mingw32 compiled make 3.80:          okay          okay?[6]

+rem  mingw32 compiled make 3.81:          okay          okay[7]

 rem

 rem [1] doesn't cope with makefiles with DOS line endings, so must mount

 rem     emacs source with text!=binary.

 rem [2] fails when needs to invoke shell commands; okay invoking gcc etc.

-rem [3] requires LC_MESSAGES support to build; maybe 2.95.x update to

-rem     cygwin provides this?

+rem [3] requires LC_MESSAGES support to build; cannot build with early

+rem     versions of cygwin.

+rem [4] may fail on Windows 9X and Windows ME; if so, install Bash.

+rem [5] fails when building leim due to the use of cygwin style paths.

+rem     May work if building emacs without leim.

+rem [6] not recommended; please report if you try this combination.

+rem [7] tested only on Windows XP.

 rem

 

 if exist config.log del config.log

diff --git a/nt/emacs.rc b/nt/emacs.rc
index 0384adc2816..4dbd51c6adc 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -6,8 +6,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,0,91,0
- PRODUCTVERSION 22,0,91,0
+ FILEVERSION 22,0,92,0
+ PRODUCTVERSION 22,0,92,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
 	BEGIN
 	    VALUE "CompanyName", "Free Software Foundation\0"
 	    VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
-	    VALUE "FileVersion", "22, 0, 91, 0\0"
+	    VALUE "FileVersion", "22, 0, 92, 0\0"
 	    VALUE "InternalName", "Emacs\0"
 	    VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0"
 	    VALUE "OriginalFilename", "emacs.exe"
 	    VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
-	    VALUE "ProductVersion", "22, 0, 91, 0\0"
+	    VALUE "ProductVersion", "22, 0, 92, 0\0"
 	    VALUE "OLESelfRegister", "\0"
 	 END
      END
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 56799f783e1..cf3b3a57990 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -200,8 +200,9 @@ OBJDIR          = oo-spd
 endif
 $(OBJDIR):;	-mkdir "$(OBJDIR)"
 BLD             = $(OBJDIR)/$(ARCH)
-$(BLD):         $(OBJDIR)
+stamp_BLD:      $(OBJDIR)
 		-mkdir "$(BLD)"
+		echo $(BLD) > $@
 
 COMPILER_TEMP_FILES =
 
@@ -266,6 +267,8 @@ endif
 
 LINK_FLAGS	= $(ARCH_LDFLAGS) $(DEBUG_LINK) $(NOCYGWIN) $(USER_LDFLAGS)
 
+export XMFLAGS
+
 .DEFAULT:
 
 $(BLD)/%.o: %.c
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 5e8de8bdf65..e63df000f08 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -21,33 +21,38 @@
 #  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

 #  Boston, MA 02110-1301, USA.

 

+# FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out

+#        (and remove or replace this comment).

+

 ALL		= addpm ddeclient runemacs cmdproxy addsection preprep

 

 .PHONY: $(ALL)

 

 TRES		= $(BLD)/emacs.res

 

-addpm:		  $(BLD) $(BLD)/addpm.exe

+XMFLAGS		=

+

+addpm:		  stamp_BLD $(BLD)/addpm.exe

 $(BLD)/addpm.exe: $(BLD)/addpm.$(O)

 		  $(LINK) $(LINK_OUT)$@ \

 		  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)

 

-ddeclient:	  $(BLD) $(BLD)/ddeclient.exe

+ddeclient:	  stamp_BLD $(BLD)/ddeclient.exe

 $(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O)

 		  $(LINK) $(LINK_OUT)$@ \

 		  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)

 

-cmdproxy:	  $(BLD) $(BLD)/cmdproxy.exe

+cmdproxy:	  stamp_BLD $(BLD)/cmdproxy.exe

 $(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O)

 		  $(LINK) $(LINK_OUT)$@ \

 		  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)

 

-addsection:	  $(BLD) $(BLD)/addsection.exe

+addsection:	  stamp_BLD $(BLD)/addsection.exe

 $(BLD)/addsection.exe: $(BLD)/addsection.$(O)

 		  $(LINK) $(LINK_OUT)$@ \

 		  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)

 

-preprep:	  $(BLD) $(BLD)/preprep.exe

+preprep:	  stamp_BLD $(BLD)/preprep.exe

 $(BLD)/preprep.exe: $(BLD)/preprep.$(O)

 		  $(LINK) $(LINK_OUT)$@ \

 		  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS)

@@ -56,10 +61,10 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
 # The resource file.  NT 3.10 requires the use of cvtres; even though

 # it is not necessary on later versions, it is still ok to use it.

 #

-$(TRES):	emacs.rc

-		$(RC) $(RC_OUT)$(BLD)/emacs.res $(ALL_DEPS)

+$(TRES):	emacs.rc stamp_BLD

+		$(RC) $(RC_OUT)$(BLD)/emacs.res emacs.rc

 

-runemacs:	  $(BLD) $(BLD)/runemacs.exe

+runemacs:	  stamp_BLD $(BLD)/runemacs.exe

 $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)

 		  $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \

 		  $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)

@@ -67,12 +72,18 @@ $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
 which-sh:

 	@echo Using $(THE_SHELL) as shell.

 

+# These depend on stamp_BLD to make sure the $(BLD) directory is created

+# before the compilation begins, even if Make runs several commands

+# in parallel under "make -j".

+#

+$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): stamp_BLD

+

 #

 # Build emacs

 #

-all:	which-sh $(BLD) $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)

+all:	which-sh stamp_BLD $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)

 

-all-other-dirs-nmake:

+all-other-dirs-nmake: addsection

 	cd ..\lib-src

 	$(MAKE) $(MFLAGS) all

 	cd ..\src

@@ -83,11 +94,11 @@ all-other-dirs-nmake:
 	$(MAKE) $(MFLAGS) all

 	cd ..\nt

 

-all-other-dirs-gmake:

-	$(MAKE) $(MFLAGS) -C ../lib-src all

-	$(MAKE) $(MFLAGS) -C ../src all

-	$(MAKE) $(MFLAGS) -C ../lisp all

-	$(MAKE) $(MFLAGS) -C ../leim all

+all-other-dirs-gmake: addsection

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim all

 

 recompile:	recompile-$(MAKETYPE)

 

@@ -97,7 +108,7 @@ recompile-nmake:
 	cd ..\nt

 

 recompile-gmake:

-	$(MAKE) $(MFLAGS) -C ../lisp recompile

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp recompile

 

 #### Bootstrapping.

 

@@ -127,9 +138,10 @@ maybe-bootstrap-SH: doit
 	  exit -1; \

 	fi

 

-bootstrap:	addsection bootstrap-$(MAKETYPE) all

+bootstrap:	addsection bootstrap-$(MAKETYPE)

+	$(MAKE) $(MFLAGS) $(XMFLAGS) all

 

-bootstrap-nmake:

+bootstrap-nmake: addsection

 	cd ..\lisp

 	$(MAKE) $(MFLAGS) bootstrap-clean

 	cd ..\src

@@ -145,14 +157,14 @@ bootstrap-nmake:
 	$(MAKE) $(MFLAGS) DOC

 	cd ..\nt

 

-bootstrap-gmake:

-	$(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean

-	$(MAKE) $(MFLAGS) -C ../src clean

-	$(MAKE) $(MFLAGS) -C ../lib-src clean

-	$(MAKE) $(MFLAGS) -C ../src bootstrap

-	$(MAKE) $(MFLAGS) -C ../src bootstrap-clean

-	$(MAKE) $(MFLAGS) -C ../lisp bootstrap

-	$(MAKE) $(MFLAGS) -C ../lib-src DOC

+bootstrap-gmake: addsection

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC

 

 bootstrap-clean: bootstrap-clean-$(MAKETYPE)

 

@@ -163,8 +175,8 @@ bootstrap-clean-nmake:
 	$(MAKE) $(MFLAGS) bootstrap-clean

 

 bootstrap-clean-gmake:

-	$(MAKE) $(MFLAGS) -C ../src bootstrap-clean

-	$(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean

 

 $(INSTALL_DIR):

 	- mkdir "$(INSTALL_DIR)"

@@ -209,10 +221,10 @@ install-other-dirs-nmake:
 	cd ..\nt

 

 install-other-dirs-gmake:

-	$(MAKE) $(MFLAGS) -C ../lib-src install

-	$(MAKE) $(MFLAGS) -C ../src install

-	$(MAKE) $(MFLAGS) -C ../lisp install

-	$(MAKE) $(MFLAGS) -C ../leim install

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src install

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src install

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install

 

 force-info:

 # Note that man/makefile knows how to

@@ -229,15 +241,16 @@ info-nmake:
 	$(MAKE) $(MFLAGS) info

 

 info-gmake:

-	$(MAKE) $(MFLAGS) -C ../man info

-	$(MAKE) $(MFLAGS) -C ../lispref info

-	$(MAKE) $(MFLAGS) -C ../lispintro info

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../man info

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispref info

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispintro info

 #

 # Maintenance

 #

 clean:	clean-other-dirs-$(MAKETYPE)

 	- $(DEL) *~ $(COMPILER_TEMP_FILES)

 	- $(DEL_TREE) $(OBJDIR)

+	- $(DEL) stamp_BLD

 	- $(DEL) ../etc/DOC ../etc/DOC-X

 

 clean-other-dirs-nmake:

@@ -258,10 +271,10 @@ clean-other-dirs-nmake:
 	cd ..\nt

 

 clean-other-dirs-gmake:

-	$(MAKE) $(MFLAGS) -C ../lib-src clean

-	$(MAKE) $(MFLAGS) -C ../src clean

-	$(MAKE) $(MFLAGS) -C ../lisp clean

-	$(MAKE) $(MFLAGS) -C ../leim clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp clean

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean

 

 cleanall-other-dirs-nmake:

 	cd ..\lib-src

@@ -271,8 +284,8 @@ cleanall-other-dirs-nmake:
 	cd ..\nt

 

 cleanall-other-dirs-gmake:

-	$(MAKE) $(MFLAGS) -C ../lib-src cleanall

-	$(MAKE) $(MFLAGS) -C ../src cleanall

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall

+	$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall

 

 cleanall: clean cleanall-other-dirs-$(MAKETYPE)

 	 - $(DEL_TREE) obj

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 94fa9f431e9..96973e53a32 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -139,7 +139,7 @@ SYS_LDFLAGS	= -nologo -release -incremental:no -version:3.10 -swaprun:cd -swapru
 

 # see comments in allocate_heap in w32heap.c before changing any of the

 # -stack, -heap, or -base settings.

-TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)

+TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)

 

 !ifdef NOOPT

 OBJDIR          = obj

@@ -148,8 +148,9 @@ OBJDIR          = obj-spd
 !endif

 $(OBJDIR):;	-mkdir $(OBJDIR)

 BLD             = $(OBJDIR)/$(ARCH)

-$(BLD):         $(OBJDIR)

+stamp_BLD:      $(OBJDIR)

 		-mkdir "$(BLD)"

+		echo $(BLD) > $@

 

 COMPILER_TEMP_FILES = *.pdb

 

@@ -172,7 +173,7 @@ DEBUG_FLAG =
 DEBUG_LINK =

 !else

 DEBUG_FLAG = -Zi

-DEBUG_LINK = -debug:full -debugtype:both

+DEBUG_LINK = -debug:full

 !endif

 

 !if "$(ARCH)" == "i386"