(message_dolog): Give correct args to

[bpt/emacs.git] / src / makefile.nt

diff --git a/src/makefile.nt b/src/makefile.nt
index b376870..f6eebf1 100644 (file)
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -1,4 +1,4 @@
-#  Makefile for GNU Emacs on Windows NT
+#  Makefile for GNU Emacs on the Microsoft W32 API.
 #  Copyright (c) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
 #   Tim Fleehart (apollo@online.com)            17-Apr-92
 #   Geoff Voelker (voelker@cs.washington.edu)   11-20-93
@@ -36,6 +36,7 @@ LOCAL_FLAGS     = -Demacs=1 -DWINDOWSNT -DDOS_NT -DHAVE_CONFIG_H -I..\nt\inc
 
 EMACS           = $(BLD)\emacs.exe
 TEMACS          = $(BLD)\temacs.exe
+TLIB0           = $(BLD)\temacs0.lib
 TLIB1           = $(BLD)\temacs1.lib
 TLIB2           = $(BLD)\temacs2.lib
 !IFDEF NTGUI
@@ -43,7 +44,7 @@ TLIBW32         = $(BLD)\temacw32.lib
 !ELSE
 TLIBW32                =
 !ENDIF
-TOBJ            = $(BLD)\emacs.obj
+TOBJ            = $(BLD)\firstfile.obj
 !if $(MSVCNT11)
 TRES           = $(BLD)\emacs.res
 !else
@@ -53,12 +54,17 @@ TLASTLIB    = $(BLD)\lastfile.lib
 
 # see comments in allocate_heap in w32heap.c before changing any of the
 # -stack, -heap, or -base settings.
-LINK_FLAGS      = $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:cv -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map
+LINK_FLAGS      = $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map
 
 #
 # Split up the objects into two sets so that we don't run out of
 # command line space when we link them into a library.
 #
+# Put emacs.obj in a separate lib, since we need to have firstfile.obj
+# as the "main" object file when linking.
+#
+OBJ0 =  $(BLD)\emacs.obj
+
 OBJ1 =  $(BLD)\abbrev.obj       \
        $(BLD)\alloc.obj        \
        $(BLD)\alloca.obj       \
@@ -118,7 +124,12 @@ OBJ2 =  $(BLD)\w32.obj           \
        $(BLD)\textprop.obj     \
        $(BLD)\vm-limit.obj     \
        $(BLD)\region-cache.obj \
-       $(BLD)\strftime.obj
+       $(BLD)\strftime.obj     \
+       $(BLD)\charset.obj      \
+       $(BLD)\coding.obj       \
+       $(BLD)\category.obj     \
+       $(BLD)\ccl.obj          \
+       $(BLD)\fontset.obj
 
 WIN32OBJ = $(BLD)\w32term.obj  \
           $(BLD)\w32xfns.obj   \
@@ -128,7 +139,8 @@ WIN32OBJ = $(BLD)\w32term.obj       \
           $(BLD)\w32menu.obj   \
           $(BLD)\w32reg.obj
 
-LIBS =  $(TLIB1)       \
+LIBS =  $(TLIB0)       \
+       $(TLIB1)        \
        $(TLIB2)        \
 !IFDEF NTGUI
        $(TLIBW32)      \
@@ -174,13 +186,14 @@ emacs:          $(EMACS)
 $(EMACS):       $(PREPARED_HEADERS) $(DOC) $(TEMACS)
                cd $(BLD)
                temacs.exe -batch -l loadup dump
+               copy temacs.map emacs.map
                cd ..\..
 
 #
 # The undumped executable
 #
 temacs:         $(BLD) $(TEMACS)
-$(TEMACS):      $(TLIB1) $(TLIB2) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)
+$(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)
                $(LINK) -out:$(TEMACS) $(LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
 
 #
@@ -197,6 +210,8 @@ $(TRES):    ..\nt\emacs.rc
 # Build the library.  Split up the build into two phases...otherwise we 
 # run out of command line space.
 #
+$(TLIB0):       $(OBJ0)
+               @- $(AR) -out:$@ $**
 $(TLIB1):       $(OBJ1)
                @- $(AR) -out:$@ $**
 $(TLIB2):      $(OBJ2)
@@ -301,12 +316,18 @@ $(BLD)\buffer.obj : \
 
 $(BLD)\bytecode.obj : \
        $(SRC)\bytecode.c \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h \
        $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\syntax.h
 
 $(BLD)\callint.obj : \
        $(SRC)\callint.c \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h \
        $(SRC)\lisp.h \
        $(SRC)\buffer.h \
        $(SRC)\commands.h \
@@ -529,6 +550,12 @@ $(BLD)\filemode.obj : \
        $(SRC)\m\intel386.h \
        $(SRC)\config.h
 
+$(BLD)\firstfile.obj : \
+       $(SRC)\firstfile.c \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h
+
 $(BLD)\floatfns.obj : \
        $(SRC)\floatfns.c \
        $(EMACS_ROOT)\src\s\ms-w32.h \
@@ -672,7 +699,10 @@ $(BLD)\keymap.obj : \
        $(SRC)\blockinput.h
 
 $(BLD)\lastfile.obj : \
-       $(SRC)\lastfile.c
+       $(SRC)\lastfile.c \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h
 
 $(BLD)\lread.obj : \
        $(SRC)\lread.c \
@@ -740,7 +770,10 @@ $(BLD)\w32.obj : \
 
 $(BLD)\w32heap.obj : \
        $(SRC)\w32heap.c \
-       $(SRC)\w32heap.h
+       $(SRC)\w32heap.h \
+       $(SRC)\s\ms-w32.h \
+       $(SRC)\m\intel386.h \
+       $(SRC)\config.h
 
 $(BLD)\w32inevt.obj : \
        $(SRC)\w32inevt.c \
@@ -759,6 +792,7 @@ $(BLD)\w32proc.obj : \
        $(SRC)\config.h \
        $(SRC)\lisp.h \
        $(SRC)\w32.h \
+       $(SRC)\w32heap.h \
        $(SRC)\vmstime.h \
        $(SRC)\systime.h
 
@@ -874,7 +908,6 @@ $(BLD)\strftime.obj : \
        $(EMACS_ROOT)\src\s\ms-w32.h \
        $(EMACS_ROOT)\src\m\intel386.h \
        $(EMACS_ROOT)\src\config.h
-       $(CC) $(CFLAGS) -Dstrftime=emacs_strftime -Fo$@ strftime.c
 
 $(BLD)\sunfns.obj : \
        $(SRC)\sunfns.c \
@@ -981,6 +1014,9 @@ $(BLD)\undo.obj : \
 
 $(BLD)\unexw32.obj : \
        $(SRC)\unexw32.c \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h \
        $(SRC)\w32heap.h
 
 $(BLD)\vm-limit.obj : \
@@ -1042,7 +1078,7 @@ $(BLD)\w32faces.obj: \
        $(SRC)\w32faces.c \
        $(SRC)\lisp.h \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
        $(SRC)\buffer.h \
        $(SRC)\dispextern.h \
        $(SRC)\frame.h \
@@ -1057,7 +1093,7 @@ $(BLD)\w32fns.obj: \
        $(SRC)\w32fns.c \
        $(SRC)\lisp.h \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
        $(SRC)\frame.h \
        $(SRC)\window.h \
        $(SRC)\buffer.h \
@@ -1089,7 +1125,7 @@ $(BLD)\w32term.obj: \
        $(SRC)\lisp.h \
        $(SRC)\blockinput.h \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
        $(SRC)\systty.h \
        $(SRC)\systime.h \
        $(SRC)\frame.h \
@@ -1111,7 +1147,7 @@ $(BLD)\w32select.obj: \
        $(SRC)\w32select.c \
        $(SRC)\lisp.h \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
        $(SRC)\dispextern.h \
        $(SRC)\frame.h \
        $(SRC)\blockinput.h
@@ -1123,5 +1159,16 @@ $(BLD)\w32reg.obj: \
        $(SRC)\w32reg.c \
        $(SRC)\lisp.h \
        $(SRC)\w32term.h \
-       $(SRC)\win32.h \
+       $(SRC)\w32gui.h \
+       $(SRC)\blockinput.h
+
+$(BLD)\w32xfns.obj: \
+       $(EMACS_ROOT)\src\s\ms-w32.h \
+       $(EMACS_ROOT)\src\m\intel386.h \
+       $(EMACS_ROOT)\src\config.h \
+       $(SRC)\w32xfns.c \
+       $(SRC)\lisp.h \
+       $(SRC)\w32term.h \
+       $(SRC)\w32.h \
+       $(SRC)\frame.h \
        $(SRC)\blockinput.h