Comment change.

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

diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index 46cc230..a94938a 100644 (file)
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,5 +1,6 @@
-#  Makefile for GNU Emacs on the Microsoft W32 API.
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.
+#  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004,
+#                2005, 2006 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -15,8 +16,8 @@
 #
 #  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.
+#  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#  Boston, MA 02110-1301, USA.
 #
 
 ALL = emacs
@@ -42,6 +43,8 @@ TOBJ            = $(BLD)/firstfile.$(O)
 TRES           = $(BLD)/emacs.res
 TLASTLIB       = $(BLD)/lastfile.$(A)
 
+DOC            = $(OBJDIR)/etc/DOC-X
+
 FULL_LINK_FLAGS      = $(LINK_FLAGS) $(TEMACS_EXTRA_LINK)
 
 #
@@ -55,7 +58,6 @@ OBJ0 =  $(BLD)/emacs.$(O)
 
 OBJ1 =  $(BLD)/abbrev.$(O)                     \
        $(BLD)/alloc.$(O)                       \
-       $(BLD)/alloca.$(O)                      \
        $(BLD)/atimer.$(O)                      \
        $(BLD)/buffer.$(O)                      \
        $(BLD)/bytecode.$(O)                    \
@@ -119,7 +121,9 @@ OBJ1 =  $(BLD)/abbrev.$(O)                  \
        $(BLD)/coding.$(O)                      \
        $(BLD)/category.$(O)                    \
        $(BLD)/ccl.$(O)                         \
-       $(BLD)/fontset.$(O)
+       $(BLD)/fontset.$(O)                     \
+       $(BLD)/fringe.$(O)                      \
+       $(BLD)/image.$(O)
 
 WIN32OBJ = $(BLD)/w32term.$(O)                 \
           $(BLD)/w32xfns.$(O)                  \
@@ -141,6 +145,7 @@ LIBS =  $(TLIB0)    \
        $(USER32)       \
        $(MPR)          \
        $(SHELL32)      \
+       $(WINSPOOL)     \
        $(libc)
 
 #
@@ -163,9 +168,13 @@ $(EMACS):       $(DOC) $(TEMACS)
 # (it is the preload heap size in MB).
 #
 temacs:         $(BLD) $(TEMACS)
-$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)
+$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \
+                 ../nt/$(BLD)/addsection.exe
        $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
        "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 16
+       echo $(OBJ0) > $(BLD)/buildobj.lst
+       echo $(OBJ1) >> $(BLD)/buildobj.lst
+       echo $(WIN32OBJ) >> $(BLD)/buildobj.lst
 
 bootstrap: bootstrap-emacs
 
@@ -173,6 +182,8 @@ bootstrap: bootstrap-emacs
 # Build a temacs with a sufficiently large PURESIZE to load the
 # Lisp files from loadup.el in source form.
 #
+# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
+#          this can break with GNU Make 3.81 and later if sh.exe is used.
 bootstrap-temacs:
        $(MAKE) $(MFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE)
 
@@ -288,18 +299,6 @@ $(BLD)/alloc.$(O) : \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
 
-$(BLD)/alloca.$(O) : \
-       $(SRC)/alloca.c \
-       $(EMACS_ROOT)/src/s/ms-w32.h \
-       $(EMACS_ROOT)/src/m/intel386.h \
-       $(EMACS_ROOT)/src/config.h \
-       $(SRC)/s/ms-w32.h \
-       $(SRC)/m/intel386.h \
-       $(SRC)/config.h \
-       $(SRC)/atimer.h \
-       $(SRC)/blockinput.h \
-       $(SRC)/systime.h
-
 $(BLD)/atimer.$(O) : \
        $(SRC)/atimer.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
@@ -342,7 +341,8 @@ $(BLD)/bytecode.$(O) : \
        $(EMACS_ROOT)/src/config.h \
        $(SRC)/buffer.h \
        $(SRC)/charset.h \
-       $(SRC)/syntax.h
+       $(SRC)/syntax.h \
+       $(SRC)/window.h
 
 $(BLD)/callint.$(O) : \
        $(SRC)/callint.c \
@@ -464,6 +464,7 @@ $(BLD)/coding.$(O) : \
        $(SRC)/coding.h \
        $(SRC)/composite.h \
        $(SRC)/dispextern.h \
+       $(SRC)/intervals.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/window.h
@@ -597,7 +598,9 @@ $(BLD)/emacs.$(O) : \
        $(SRC)/systty.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32bdf.h \
-       $(SRC)/w32gui.h
+       $(SRC)/w32gui.h \
+       $(SRC)/w32heap.h \
+       $(SRC)/window.h
 
 $(BLD)/eval.$(O) : \
        $(SRC)/eval.c \
@@ -715,6 +718,8 @@ $(BLD)/frame.$(O) : \
        $(EMACS_ROOT)/src/s/ms-w32.h \
        $(EMACS_ROOT)/src/m/intel386.h \
        $(EMACS_ROOT)/src/config.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
        $(SRC)/buffer.h \
        $(SRC)/charset.h \
        $(SRC)/commands.h \
@@ -722,12 +727,28 @@ $(BLD)/frame.$(O) : \
        $(SRC)/fontset.h \
        $(SRC)/frame.h \
        $(SRC)/keyboard.h \
+       $(SRC)/systime.h \
        $(SRC)/termhooks.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
        $(SRC)/w32term.h \
        $(SRC)/window.h
 
+$(BLD)/fringe.$(O) : \
+       $(SRC)/fringe.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/buffer.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/frame.h \
+       $(SRC)/systime.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/window.h
+
 $(BLD)/gmalloc.$(O) : \
        $(SRC)/gmalloc.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
@@ -736,6 +757,24 @@ $(BLD)/gmalloc.$(O) : \
        $(EMACS_ROOT)/nt/inc/sys/param.h \
        $(SRC)/getpagesize.h
 
+$(BLD)/image.$(O): \
+       $(SRC)/image.c \
+       $(EMACS_ROOT)/src/s/ms-w32.h \
+       $(EMACS_ROOT)/src/m/intel386.h \
+       $(EMACS_ROOT)/src/config.h \
+       $(SRC)/atimer.h \
+       $(SRC)/blockinput.h \
+       $(SRC)/dispextern.h \
+       $(SRC)/epaths.h \
+       $(SRC)/frame.h \
+       $(SRC)/systime.h \
+       $(SRC)/termhooks.h \
+       $(SRC)/w32bdf.h \
+       $(SRC)/w32gui.h \
+       $(SRC)/w32heap.h \
+       $(SRC)/w32term.h \
+       $(SRC)/window.h
+
 $(BLD)/indent.$(O) : \
        $(SRC)/indent.c \
        $(EMACS_ROOT)/src/s/ms-w32.h \
@@ -1267,6 +1306,7 @@ $(BLD)/xdisp.$(O) : \
        $(SRC)/indent.h \
        $(SRC)/intervals.h \
        $(SRC)/keyboard.h \
+       $(SRC)/keymap.h \
        $(SRC)/macros.h \
        $(SRC)/process.h \
        $(SRC)/region-cache.h \
@@ -1395,6 +1435,7 @@ $(BLD)/w32select.$(O): \
        $(SRC)/systime.h \
        $(SRC)/w32bdf.h \
        $(SRC)/w32gui.h \
+       $(SRC)/w32heap.h \
        $(SRC)/w32term.h
 
 $(BLD)/w32reg.$(O): \