1 files changed, 12 insertions, 9 deletions

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 88b53554925..d7ca325e223 100644
--- a/src/makefile.w32-in
+++ b/src/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.
 
@@ -24,6 +24,9 @@ ALL = emacs
 # Set EMACSLOADPATH correctly (in case already defined in environment).
 EMACSLOADPATH=$(CURDIR)/../lisp
 
+# Size in MBs of the static heap in temacs.exe.
+HEAPSIZE = 27
+
 #
 # HAVE_CONFIG_H is required by some generic gnu sources stuck into
 # the emacs source tree.
@@ -177,7 +180,7 @@ temacs:         stamp_BLD $(TEMACS)
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \
                   ../nt/$(BLD)/addsection.exe $(GNULIB)
         $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
-        "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21
+        "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP $(HEAPSIZE)
 
 # These omit firstfile.${O}, but there's no documentation in there
 # anyways.
@@ -221,7 +224,8 @@ GLOBAL_SOURCES =   dosfns.c msdos.c \
         syntax.c bytecode.c \
         process.c callproc.c unexw32.c \
         region-cache.c sound.c atimer.c \
-        doprnt.c intervals.c textprop.c composite.c
+        doprnt.c intervals.c textprop.c composite.c \
+        gnutls.c
 SOME_MACHINE_OBJECTS = dosfns.o msdos.o \
         xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o dbusbind.o
 obj = $(GLOBAL_SOURCES:.c=.o)
@@ -231,7 +235,7 @@ globals.h: gl-stamp
 
 gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES)
         - $(DEL) gl-tmp
-        "../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
+        "$(THISDIR)/../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp
         cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h"
         - $(DEL) gl-tmp
         echo timestamp > $@
@@ -347,11 +351,11 @@ TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2)
 TAGS-gmake:
         ../lib-src/$(BLD)/etags.exe --include=TAGS-LISP --include=../nt/TAGS \
           --regex=@../nt/emacs-src.tags \
-          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ0))
+          $(OBJ0_c)
         ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
-          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1))
+          $(OBJ1_c)
         ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \
-          $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2)) \
+          $(OBJ2_c) \
           $(CURDIR)/*.h $(CURDIR)/m/intel386.h $(CURDIR)/s/ms-w32.h
 
 TAGS-nmake:
@@ -468,6 +472,7 @@ $(BLD)/alloc.$(O) : \
         $(SRC)/syssignal.h \
         $(SRC)/w32.h \
         $(NT_INC)/unistd.h \
+        $(GNU_LIB)/verify.h \
         $(BLOCKINPUT_H) \
         $(CHARACTER_H) \
         $(CONFIG_H) \
@@ -492,8 +497,6 @@ $(BLD)/atimer.$(O) : \
 
 $(BLD)/bidi.$(O) : \
         $(SRC)/bidi.c \
-        $(SRC)/bidimirror.h \
-        $(SRC)/biditype.h \
         $(SRC)/buffer.h \
         $(CHARACTER_H) \
         $(CONFIG_H) \