X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=nt%2Fxemacs.mak;h=19bed41d498f5638a651d46d327224bfab76b25f;hb=01dc57284a79d66c5c2b141a304b52f5f8e76d61;hp=ee3b96a1e695bf0ed426fc6d833936cfb8141472;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1

diff --git a/nt/xemacs.mak b/nt/xemacs.mak
index ee3b96a..19bed41 100644
--- a/nt/xemacs.mak
+++ b/nt/xemacs.mak
@@ -26,7 +26,12 @@
 
 XEMACS=..
 LISP=$(XEMACS)\lisp
+MODULES=$(XEMACS)\modules
 NT=$(XEMACS)\nt
+OUTDIR=$(NT)\obj
+
+# Define a variable for the 'del' command to use
+DEL=-del
 
 # Program name and version
 
@@ -65,23 +70,44 @@ INSTALL_DIR=c:\Program Files\Infodock\Infodock-$(INFODOCK_VERSION_STRING)
 INSTALL_DIR=c:\Program Files\XEmacs\XEmacs-$(XEMACS_VERSION_STRING)
 ! endif
 !endif
-!if !defined(PACKAGEPATH)
-PATH_PACKAGEPATH="c:\\Program Files\\XEmacs\\packages"
-!else
-PATH_PACKAGEPATH="$(PACKAGEPATH)"
+!if !defined(HAVE_MULE)
+HAVE_MULE=0
+!endif
+!if !defined(PACKAGE_PATH)
+! if !defined(PACKAGE_PREFIX)
+PACKAGE_PREFIX=c:\Program Files\XEmacs
+! endif
+! if $(HAVE_MULE)
+PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\mule-packages;$(PACKAGE_PREFIX)\xemacs-packages
+! else
+PACKAGE_PATH=~\.xemacs;;$(PACKAGE_PREFIX)\site-packages;$(PACKAGE_PREFIX)\xemacs-packages
+! endif
 !endif
+PATH_PACKAGEPATH="$(PACKAGE_PATH:\=\\)"
 !if !defined(HAVE_MSW)
 HAVE_MSW=1
 !endif
 !if !defined(HAVE_X)
 HAVE_X=0
 !endif
-!if !defined(HAVE_MULE)
-HAVE_MULE=0
-!endif
 !if !defined(HAVE_XPM)
 HAVE_XPM=0
 !endif
+!if !defined(HAVE_PNG)
+HAVE_PNG=0
+!endif
+!if !defined(HAVE_TIFF)
+HAVE_TIFF=0
+!endif
+!if !defined(HAVE_JPEG)
+HAVE_JPEG=0
+!endif
+!if !defined(HAVE_XFACE)
+HAVE_XFACE=0
+!endif
+!if !defined(HAVE_GIF)
+HAVE_GIF=1
+!endif
 !if !defined(HAVE_TOOLBARS)
 HAVE_TOOLBARS=$(HAVE_XPM)
 !endif
@@ -94,26 +120,49 @@ HAVE_MSW_C_DIRED=1
 !if !defined(HAVE_NATIVE_SOUND)
 HAVE_NATIVE_SOUND=1
 !endif
+!if !defined(HAVE_WIDGETS)
+HAVE_WIDGETS=1
+!endif
 !if !defined(DEBUG_XEMACS)
 DEBUG_XEMACS=0
 !endif
 !if !defined(USE_UNION_TYPE)
 USE_UNION_TYPE=0
 !endif
+!if !defined(USE_MINITAR)
+USE_MINITAR=1
+!endif
 !if !defined(USE_MINIMAL_TAGBITS)
 USE_MINIMAL_TAGBITS=0
 !endif
 !if !defined(USE_INDEXED_LRECORD_IMPLEMENTATION)
 USE_INDEXED_LRECORD_IMPLEMENTATION=0
 !endif
+!if !defined(USE_PORTABLE_DUMPER)
+USE_PORTABLE_DUMPER=0
+!endif
+!if !defined(GUNG_HO)
+GUNG_HO=0
+!endif
+
+# A little bit of adhockery. Default to use system malloc and
+# DLL version of the C runtime library when using portable
+# dumping. These are the optimal settings.
+!if !defined(USE_SYSTEM_MALLOC)
+USE_SYSTEM_MALLOC=$(USE_PORTABLE_DUMPER)
+!endif
+!if !defined(USE_CRTDLL)
+USE_CRTDLL=$(USE_PORTABLE_DUMPER)
+!endif
 
 #
 # System configuration
 #
-!if !defined(PROCESSOR_ARCHITECTURE) && "$(OS)" != "Windows_NT"
-EMACS_CONFIGURATION=i386-pc-win32
+!if !defined(OS)
+OS=Windows_95/98
+EMACS_CONFIGURATION=i586-pc-win32
 !else if "$(PROCESSOR_ARCHITECTURE)" == "x86"
-EMACS_CONFIGURATION=i386-pc-win32
+EMACS_CONFIGURATION=i586-pc-win32
 !else if "$(PROCESSOR_ARCHITECTURE)" == "MIPS"
 EMACS_CONFIGURATION=mips-pc-win32
 !else if "$(PROCESSOR_ARCHITECTURE)" == "ALPHA"
@@ -132,6 +181,19 @@ CONFIG_ERROR=0
 !message Cannot build InfoDock without InfoDock sources
 CONFIG_ERROR=1
 !endif
+!if !$(USE_PORTABLE_DUMPER) && $(USE_SYSTEM_MALLOC)
+!message Cannot use system allocator when dumping old way, use portable dumper.
+CONFIG_ERROR=1
+!endif
+!if !$(USE_PORTABLE_DUMPER) && $(USE_CRTDLL)
+!message Cannot use C runtime DLL when dumping old way, use portable dumper.
+CONFIG_ERROR=1
+!endif
+!if !$(USE_SYSTEM_MALLOC) && $(USE_CRTDLL)
+!message GNU malloc currently cannot be used with CRT DLL.
+!message [[[Developer note: If you want to fix it, read Q112297 first]]]  ####
+CONFIG_ERROR=1
+!endif
 !if !$(HAVE_MSW) && !$(HAVE_X)
 !message Please specify at least one HAVE_MSW=1 and/or HAVE_X=1
 CONFIG_ERROR=1
@@ -152,99 +214,94 @@ CONFIG_ERROR=1
 !message Specified XPM directory does not contain "$(XPM_DIR)\lib\Xpm.lib"
 CONFIG_ERROR=1
 !endif
-!if $(HAVE_MSW) && $(HAVE_TOOLBARS) && !$(HAVE_XPM)
-!error Toolbars require XPM support
+!if $(HAVE_MSW) && $(HAVE_PNG) && !defined(PNG_DIR)
+!message Please specify root directory for your PNG installation: PNG_DIR=path
 CONFIG_ERROR=1
 !endif
-!if $(CONFIG_ERROR)
-!error Configuration error(s) found
-!endif
-
-#
-# Handle GUNG_HO
-#
-!if defined(GUNG_HO)
-USE_MINIMAL_TAGBITS=$(GUNG_HO)
-USE_INDEXED_LRECORD_IMPLEMENTATION=$(GUNG_HO)
-!endif
-
-#
-# Small configuration report
-#
-!if !defined(CONF_REPORT_ALREADY_PRINTED)
-!if [set CONF_REPORT_ALREADY_PRINTED=1]
-!endif
-!message ------------------------------------------------
-!message Configured for "$(EMACS_CONFIGURATION)".
-!message 
-!message Installation directory is "$(INSTALL_DIR)".
-!message Package path is $(PATH_PACKAGEPATH).
-!message 
-!if $(INFODOCK)
-!message Building InfoDock.
-!endif
-!if $(HAVE_MSW)
-!message Compiling in support for native GUI.
+!if $(HAVE_MSW) && $(HAVE_PNG) && defined(PNG_DIR) && !exist("$(PNG_DIR)\libpng.lib")
+!message Specified PNG directory does not contain "$(PNG_DIR)\libpng.lib"
+CONFIG_ERROR=1
 !endif
-!if $(HAVE_X)
-!message Compiling in support for X-Windows.
+!if $(HAVE_MSW) && $(HAVE_PNG) && !defined(ZLIB_DIR)
+!message Please specify root directory for your ZLIB installation: ZLIB_DIR=path
+CONFIG_ERROR=1
 !endif
-!if $(HAVE_MULE)
-!message Compiling in MULE.
+!if $(HAVE_MSW) && $(HAVE_PNG) && defined(ZLIB_DIR) && !exist("$(ZLIB_DIR)\zlib.lib")
+!message Specified ZLIB directory does not contain "$(ZLIB_DIR)\zlib.lib"
+CONFIG_ERROR=1
 !endif
-!if $(HAVE_XPM)
-!message Compiling in support for XPM images.
+!if $(HAVE_MSW) && $(HAVE_TIFF) && !defined(TIFF_DIR)
+!message Please specify root directory for your TIFF installation: TIFF_DIR=path
+CONFIG_ERROR=1
 !endif
-!if $(HAVE_TOOLBARS)
-!message Compiling in support for toolbars.
+!if $(HAVE_MSW) && $(HAVE_TIFF) && !exist("$(TIFF_DIR)\libtiff\libtiff.lib")
+!message Specified TIFF directory does not contain "$(TIFF_DIR)\libtiff\libtiff.lib"
+CONFIG_ERROR=1
 !endif
-!if $(HAVE_DIALOGS)
-!message Compiling in support for dialogs.
+!if $(HAVE_MSW) && $(HAVE_JPEG) && !defined(JPEG_DIR)
+!message Please specify root directory for your JPEG installation: JPEG_DIR=path
+CONFIG_ERROR=1
 !endif
-!if $(HAVE_NATIVE_SOUND)
-!message Compiling in support for native sounds.
+!if $(HAVE_MSW) && $(HAVE_JPEG) && !exist("$(JPEG_DIR)\libjpeg.lib")
+!message Specified JPEG directory does not contain "$(JPEG_DIR)\libjpeg.lib"
+CONFIG_ERROR=1
 !endif
-!if $(HAVE_MSW_C_DIRED)
-# Define HAVE_MSW_C_DIRED to be non-zero if you want XEmacs to use C
-# primitives to significantly speed up dired, at the expense of an
-# additional ~4KB of code.
-!message Compiling in fast dired implementation.
+!if $(HAVE_MSW) && $(HAVE_XFACE) && !defined(COMPFACE_DIR)
+!message Please specify root directory for your COMPFACE installation: COMPFACE_DIR=path
+CONFIG_ERROR=1
 !endif
-!if $(USE_MINIMAL_TAGBITS)
-!message Using minimal tagbits.
+!if $(HAVE_MSW) && $(HAVE_XFACE) && !exist("$(COMPFACE_DIR)\libcompface.lib")
+!message Specified COMPFACE directory does not contain "$(COMPFACE_DIR)\libcompface.lib"
+CONFIG_ERROR=1
 !endif
-!if $(USE_INDEXED_LRECORD_IMPLEMENTATION)
-!message Using indexed lrecord implementation.
+!if $(HAVE_MSW) && $(HAVE_TOOLBARS) && !$(HAVE_XPM)
+!message Toolbars require XPM support
+CONFIG_ERROR=1
 !endif
-!if $(USE_UNION_TYPE)
-!message Using union type for Lisp object storage.
+!if $(CONFIG_ERROR)
+!error Configuration error(s) found
 !endif
-!if $(DEBUG_XEMACS)
-!message Compiling in extra debug checks. XEmacs will be slow!
+
+#
+# Handle GUNG_HO
+#
+!if defined(GUNG_HO)
+USE_MINIMAL_TAGBITS=$(GUNG_HO)
+USE_INDEXED_LRECORD_IMPLEMENTATION=$(GUNG_HO)
 !endif
-!message ------------------------------------------------
-!message 
-!endif # !defined(CONF_REPORT_ALREADY_PRINTED)
 
 #
-# Compiler command echo control. Define VERBOSECC=1 to get vebose compilation.
+# Compiler command echo control. Define VERBOSECC=1 to get verbose compilation.
 #
 !if !defined(VERBOSECC)
 VERBOSECC=0
 !endif
 !if $(VERBOSECC)
-CCV=$(CC) -nologo
+CCV=$(CC)
 !else
-CCV=@$(CC) -nologo
+CCV=@$(CC)
 !endif
 
 !if $(DEBUG_XEMACS)
 OPT=-Od -Zi
 !else
-OPT=-O2 -G5 -Zi
+OPT=-O2 -G5
+!endif
+
+!if $(USE_CRTDLL)
+!if $(DEBUG_XEMACS)
+C_LIBFLAG=-MDd
+LIBC_LIB=msvcrtd.lib
+!else
+C_LIBFLAG=-MD
+LIBC_LIB=msvcrt.lib
+!endif
+!else
+C_LIBFLAG=-ML
+LIBC_LIB=libc.lib
 !endif
 
-WARN_CPP_FLAGS = -W3
+CFLAGS=-nologo -W3 $(OPT) $(C_LIBFLAG)
 
 !if $(HAVE_X)
 X_DEFINES=-DHAVE_X_WINDOWS
@@ -266,6 +323,31 @@ MSW_DEFINES=$(MSW_DEFINES) -DHAVE_XPM -DFOR_MSW
 MSW_INCLUDES=$(MSW_INCLUDES) -I"$(XPM_DIR)" -I"$(XPM_DIR)\lib"
 MSW_LIBS=$(MSW_LIBS) "$(XPM_DIR)\lib\Xpm.lib"
 !endif
+!if $(HAVE_GIF)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_GIF
+MSW_GIF_SRC=$(XEMACS)\src\dgif_lib.c $(XEMACS)\src\gif_io.c
+MSW_GIF_OBJ=$(OUTDIR)\dgif_lib.obj $(OUTDIR)\gif_io.obj
+!endif
+!if $(HAVE_PNG)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_PNG
+MSW_INCLUDES=$(MSW_INCLUDES) -I"$(PNG_DIR)" -I"$(ZLIB_DIR)"
+MSW_LIBS=$(MSW_LIBS) "$(PNG_DIR)\libpng.lib" "$(ZLIB_DIR)\zlib.lib"
+!endif
+!if $(HAVE_TIFF)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_TIFF
+MSW_INCLUDES=$(MSW_INCLUDES) -I"$(TIFF_DIR)\libtiff"
+MSW_LIBS=$(MSW_LIBS) "$(TIFF_DIR)\libtiff\libtiff.lib"
+!endif
+!if $(HAVE_JPEG)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_JPEG
+MSW_INCLUDES=$(MSW_INCLUDES) -I"$(JPEG_DIR)"
+MSW_LIBS=$(MSW_LIBS) "$(JPEG_DIR)\libjpeg.lib"
+!endif
+!if $(HAVE_XFACE)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_XFACE
+MSW_INCLUDES=$(MSW_INCLUDES) -I"$(COMPFACE_DIR)"
+MSW_LIBS=$(MSW_LIBS) "$(COMPFACE_DIR)\libcompface.lib"
+!endif
 !if $(HAVE_TOOLBARS)
 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_TOOLBARS
 MSW_TOOLBAR_SRC=$(XEMACS)\src\toolbar.c $(XEMACS)\src\toolbar-msw.c
@@ -277,6 +359,9 @@ MSW_DEFINES=$(MSW_DEFINES) -DHAVE_DIALOGS
 MSW_DIALOG_SRC=$(XEMACS)\src\dialog.c $(XEMACS)\src\dialog-msw.c
 MSW_DIALOG_OBJ=$(OUTDIR)\dialog.obj $(OUTDIR)\dialog-msw.obj
 !endif
+!if $(HAVE_WIDGETS)
+MSW_DEFINES=$(MSW_DEFINES) -DHAVE_WIDGETS
+!endif
 !if $(HAVE_NATIVE_SOUND)
 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_NATIVE_SOUND
 !endif
@@ -288,7 +373,7 @@ MULE_DEFINES=-DMULE
 
 !if $(DEBUG_XEMACS)
 DEBUG_DEFINES=-DDEBUG_XEMACS -D_DEBUG 
-DEBUG_FLAGS= -debugtype:both -debug:full
+DEBUG_FLAGS=-debug:full
 !endif
 
 !if $(USE_MINIMAL_TAGBITS)
@@ -301,6 +386,16 @@ LRECORD_DEFINES=-DUSE_INDEXED_LRECORD_IMPLEMENTATION
 UNION_DEFINES=-DUSE_UNION_TYPE
 !endif
 
+!if $(USE_PORTABLE_DUMPER)
+DUMPER_DEFINES=-DPDUMP
+!endif
+
+!if $(USE_SYSTEM_MALLOC)
+MALLOC_DEFINES=-DSYSTEM_MALLOC
+!else
+MALLOC_DEFINES=-DGNU_MALLOC
+!endif
+
 # Hard-coded paths
 
 !if $(INFODOCK)
@@ -317,11 +412,10 @@ INCLUDES=$(X_INCLUDES) $(MSW_INCLUDES) -I$(XEMACS)\nt\inc -I$(XEMACS)\src -I$(XE
 
 DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) \
 	$(TAGBITS_DEFINES) $(LRECORD_DEFINES) $(UNION_DEFINES) \
+	$(DUMPER_DEFINES) $(MALLOC_DEFINES) \
 	-DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN -DWINDOWSNT -Demacs \
 	-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
 
-OUTDIR=obj
-
 #------------------------------------------------------------------------------
 
 default: $(OUTDIR)\nul all 
@@ -332,8 +426,7 @@ $(OUTDIR)\nul:
 XEMACS_INCLUDES=\
  $(XEMACS)\src\config.h \
  $(XEMACS)\src\Emacs.ad.h \
- $(XEMACS)\src\paths.h \
- $(XEMACS)\src\puresize-adjust.h
+ $(XEMACS)\src\paths.h
 
 $(XEMACS)\src\config.h:	config.h
 	copy config.h $(XEMACS)\src
@@ -344,9 +437,6 @@ $(XEMACS)\src\Emacs.ad.h:	Emacs.ad.h
 $(XEMACS)\src\paths.h:	paths.h
 	copy paths.h $(XEMACS)\src
 
-$(XEMACS)\src\puresize-adjust.h:	puresize-adjust.h
-	copy puresize-adjust.h $(XEMACS)\src
-
 #------------------------------------------------------------------------------
 
 # lib-src programs
@@ -354,16 +444,45 @@ $(XEMACS)\src\puresize-adjust.h:	puresize-adjust.h
 LIB_SRC = $(XEMACS)\lib-src
 LIB_SRC_DEFINES = -DHAVE_CONFIG_H -DWIN32 -DWINDOWSNT
 
+#
+# Creating config.values to be used by config.el
+#
+CONFIG_VALUES = $(LIB_SRC)\config.values
+!if [echo Creating $(CONFIG_VALUES) && echo ;;; Do not edit this file!>$(CONFIG_VALUES)]
+!endif
+# MAKEDIR has to be made into a string.
+#!if [echo blddir>>$(CONFIG_VALUES) && echo $(ESC)"$(MAKEDIR:\=\\)\\..$(ESC)">>$(CONFIG_VALUES)]
+!if [echo blddir>>$(CONFIG_VALUES) && echo "$(MAKEDIR:\=\\)\\..">>$(CONFIG_VALUES)]
+!endif
+!if [echo CC>>$(CONFIG_VALUES) && echo "$(CC:\=\\)">>$(CONFIG_VALUES)]
+!endif
+!if [echo CFLAGS>>$(CONFIG_VALUES) && echo "$(CFLAGS:\=\\)">>$(CONFIG_VALUES)]
+!endif
+!if [echo CPP>>$(CONFIG_VALUES) && echo "$(CPP:\=\\)">>$(CONFIG_VALUES)]
+!endif
+!if [echo CPPFLAGS>>$(CONFIG_VALUES) && echo "$(CPPFLAGS:\=\\)">>$(CONFIG_VALUES)]
+!endif
+!if [echo LISPDIR>>$(CONFIG_VALUES) && echo "$(MAKEDIR:\=\\)\\$(LISP:\=\\)">>$(CONFIG_VALUES)]
+!endif
+# PATH_PACKAGEPATH is already a quoted string.
+!if [echo PACKAGE_PATH>>$(CONFIG_VALUES) && echo $(PATH_PACKAGEPATH)>>$(CONFIG_VALUES)]
+!endif
+
 # Inferred rule
 {$(LIB_SRC)}.c{$(LIB_SRC)}.exe :
-	@cd $(LIB_SRC)
-	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) -O2 -W3 -Fe$@ $**
-	@cd $(NT)
+	cd $(LIB_SRC)
+	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** -link -incremental:no
+	cd $(NT)
 
 # Individual dependencies
 ETAGS_DEPS = $(LIB_SRC)/getopt.c $(LIB_SRC)/getopt1.c $(LIB_SRC)/../src/regex.c
 $(LIB_SRC)/etags.exe : $(LIB_SRC)/etags.c $(ETAGS_DEPS)
-#### ootags???
+$(LIB_SRC)/movemail.exe: $(LIB_SRC)/movemail.c $(LIB_SRC)/pop.c $(ETAGS_DEPS)
+	cd $(LIB_SRC)
+	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc $(LIB_SRC_DEFINES) $(CFLAGS) -Fe$@ $** wsock32.lib -link -incremental:no
+	cd $(NT)
+$(LIB_SRC)/minitar.exe : $(NT)/minitar.mak $(NT)/minitar.c
+	nmake -nologo -f minitar.mak ZLIB="$(ZLIB_DIR)" NT="$(NT)" LIB_SRC="$(LIB_SRC)"
 
 LIB_SRC_TOOLS = \
 	$(LIB_SRC)/make-docfile.exe	\
@@ -373,23 +492,36 @@ LIB_SRC_TOOLS = \
 	$(LIB_SRC)/sorted-doc.exe	\
 	$(LIB_SRC)/wakeup.exe		\
 	$(LIB_SRC)/etags.exe		
+!if $(USE_MINITAR)
+LIB_SRC_TOOLS = \
+	$(LIB_SRC_TOOLS) \
+	$(LIB_SRC)/minitar.exe
+!endif
+
+# Shorthand target
+minitar: $(LIB_SRC)/minitar.exe
 
 #------------------------------------------------------------------------------
 
-# runemacs proglet
+# runxemacs proglet
+
+RUNEMACS = $(XEMACS)\src\runxemacs.exe
 
-RUNEMACS = $(XEMACS)\src\runemacs.exe
+$(RUNEMACS): $(LIB_SRC)\run.c $(LIB_SRC)\run.res
+	$(CCV) -I$(LIB_SRC) $(CFLAGS) -Fe$@ -Fo$(LIB_SRC) -Fd$(LIB_SRC)\ $** kernel32.lib user32.lib -link -incremental:no
 
-$(RUNEMACS): $(NT)\runemacs.c $(NT)\xemacs.res
-	$(CCV) -I. -I$(XEMACS)/src -I$(XEMACS)/nt/inc -O2 -W3 -Fe$@ $** kernel32.lib user32.lib
+$(LIB_SRC)\run.res: $(LIB_SRC)\run.rc
+	rc -I$(LIB_SRC) -Fo$@ $**
 
 #------------------------------------------------------------------------------
 
 # LASTFILE Library
 
+!if !$(USE_SYSTEM_MALLOC) || !$(USE_PORTABLE_DUMPER)
+
 LASTFILE=$(OUTDIR)\lastfile.lib
 LASTFILE_SRC=$(XEMACS)\src
-LASTFILE_FLAGS=$(WARN_CPP_FLAGS) $(OPT) $(INCLUDES) -Fo$@ -c
+LASTFILE_FLAGS=$(CFLAGS) $(INCLUDES) -Fo$@ -Fd$* -c
 LASTFILE_OBJS= \
 	$(OUTDIR)\lastfile.obj
 
@@ -399,6 +531,8 @@ $(LASTFILE): $(XEMACS_INCLUDES) $(LASTFILE_OBJS)
 $(OUTDIR)\lastfile.obj:	$(LASTFILE_SRC)\lastfile.c
 	 $(CCV) $(LASTFILE_FLAGS) $**
 
+!endif
+
 #------------------------------------------------------------------------------
 
 !if $(HAVE_X)
@@ -407,7 +541,7 @@ $(OUTDIR)\lastfile.obj:	$(LASTFILE_SRC)\lastfile.c
 
 LWLIB=$(OUTDIR)\lwlib.lib
 LWLIB_SRC=$(XEMACS)\lwlib
-LWLIB_FLAGS=$(WARN_CPP_FLAGS) $(OPT) $(INCLUDES) $(DEFINES) \
+LWLIB_FLAGS=$(CFLAGS) $(INCLUDES) $(DEFINES) \
  -DNEED_ATHENA -DNEED_LUCID \
  -D_WINDOWS -DMENUBARS_LUCID -DSCROLLBARS_LUCID -DDIALOGS_ATHENA \
  -Fo$@ -c
@@ -421,7 +555,7 @@ LWLIB_OBJS= \
 	$(OUTDIR)\xlwscrollbar.obj
 
 $(LWLIB): $(LWLIB_OBJS)
-	link.exe -lib -nologo $(DEBUG_FLAGS) -out:$@ $(LWLIB_OBJS)
+	link.exe -lib -nologo -out:$@ $(LWLIB_OBJS)
 
 $(OUTDIR)\lwlib-config.obj:	$(LWLIB_SRC)\lwlib-config.c
 	 $(CCV) $(LWLIB_FLAGS) $**
@@ -482,19 +616,18 @@ DOC_SRC2=\
  $(XEMACS)\src\faces.c \
  $(XEMACS)\src\file-coding.c \
  $(XEMACS)\src\fileio.c \
- $(XEMACS)\src\filelock.c \
  $(XEMACS)\src\filemode.c \
  $(XEMACS)\src\floatfns.c \
  $(XEMACS)\src\fns.c 
 DOC_SRC3=\
  $(XEMACS)\src\font-lock.c \
  $(XEMACS)\src\frame.c \
- $(XEMACS)\src\free-hook.c \
  $(XEMACS)\src\general.c \
  $(XEMACS)\src\glyphs.c \
  $(XEMACS)\src\glyphs-eimage.c \
- $(XEMACS)\src\gmalloc.c \
+ $(XEMACS)\src\glyphs-widget.c \
  $(XEMACS)\src\gui.c  \
+ $(XEMACS)\src\gutter.c \
  $(XEMACS)\src\hash.c \
  $(XEMACS)\src\imgproc.c \
  $(XEMACS)\src\indent.c \
@@ -511,7 +644,6 @@ DOC_SRC4=\
  $(XEMACS)\src\menubar.c \
  $(XEMACS)\src\minibuf.c \
  $(XEMACS)\src\nt.c \
- $(XEMACS)\src\ntheap.c \
  $(XEMACS)\src\ntplay.c \
  $(XEMACS)\src\ntproc.c \
  $(XEMACS)\src\objects.c \
@@ -520,15 +652,14 @@ DOC_SRC4=\
  $(XEMACS)\src\process.c \
  $(XEMACS)\src\process-nt.c \
  $(XEMACS)\src\profile.c \
- $(XEMACS)\src\pure.c \
  $(XEMACS)\src\rangetab.c \
  $(XEMACS)\src\realpath.c \
  $(XEMACS)\src\redisplay-output.c \
  $(XEMACS)\src\redisplay.c \
  $(XEMACS)\src\regex.c \
  $(XEMACS)\src\scrollbar.c \
- $(XEMACS)\src\scrollbar-msw.c \
  $(XEMACS)\src\search.c \
+ $(XEMACS)\src\select.c \
  $(XEMACS)\src\signal.c \
  $(XEMACS)\src\sound.c 
 DOC_SRC5=\
@@ -540,8 +671,6 @@ DOC_SRC5=\
  $(XEMACS)\src\termcap.c  \
  $(XEMACS)\src\tparam.c \
  $(XEMACS)\src\undo.c \
- $(XEMACS)\src\unexnt.c \
- $(XEMACS)\src\vm-limit.c \
  $(XEMACS)\src\window.c \
  $(XEMACS)\src\widget.c
 
@@ -567,7 +696,7 @@ DOC_SRC6=\
  $(XEMACS)\src\balloon-x.c \
  $(XEMACS)\src\xgccache.c \
  $(XEMACS)\src\xmu.c \
- $(XEMACS)\src\xselect.c 
+ $(XEMACS)\src\select-x.c 
 !endif
 
 !if $(HAVE_MSW)
@@ -577,6 +706,7 @@ DOC_SRC7=\
  $(XEMACS)\src\event-msw.c  \
  $(XEMACS)\src\frame-msw.c \
  $(XEMACS)\src\glyphs-msw.c \
+ $(XEMACS)\src\gui-msw.c \
  $(XEMACS)\src\menubar-msw.c \
  $(XEMACS)\src\objects-msw.c \
  $(XEMACS)\src\redisplay-msw.c \
@@ -584,21 +714,37 @@ DOC_SRC7=\
  $(XEMACS)\src\select-msw.c \
  $(MSW_C_DIRED_SRC) \
  $(MSW_TOOLBAR_SRC) \
- $(MSW_DIALOG_SRC)
+ $(MSW_DIALOG_SRC) \
+ $(MSW_GIF_SRC)
 !endif
 
 !if $(HAVE_MULE)
 DOC_SRC8=\
- $(XEMACS)\src\input-method-xlib.c \
  $(XEMACS)\src\mule.c \
  $(XEMACS)\src\mule-charset.c \
- $(XEMACS)\src\mule-ccl.c \
- $(XEMACS)\src\mule-coding.c
+ $(XEMACS)\src\mule-ccl.c
+! if $(HAVE_X)
+ DOC_SRC8=$(DOC_SRC8) $(XEMACS)\src\input-method-xlib.c
+! endif
 !endif
 
 !if $(DEBUG_XEMACS)
 DOC_SRC9=\
- $(XEMACS)\src\debug.c
+ $(XEMACS)\src\debug.c \
+ $(XEMACS)\src\tests.c
+!endif
+
+!if !$(USE_SYSTEM_MALLOC)
+DOC_SRC10=\
+ $(XEMACS)\src\free-hook.c \
+ $(XEMACS)\src\gmalloc.c \
+ $(XEMACS)\src\ntheap.c \
+ $(XEMACS)\src\vm-limit.c
+!endif
+
+!if !$(USE_PORTABLE_DUMPER)
+DOC_SRC11=\
+ $(XEMACS)\src\unexnt.c
 !endif
 
 #------------------------------------------------------------------------------
@@ -610,18 +756,23 @@ DOC_SRC9=\
 EMACS_BETA_VERSION=-DEMACS_BETA_VERSION=$(emacs_beta_version)
 !ENDIF
 
+!if !$(USE_PORTABLE_DUMPER)
+TEMACS_ENTRYPOINT=-entry:_start 
+!endif
+
 TEMACS_DIR=$(XEMACS)\src
 TEMACS=$(TEMACS_DIR)\temacs.exe
 TEMACS_BROWSE=$(TEMACS_DIR)\temacs.bsc
 TEMACS_SRC=$(XEMACS)\src
 TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) $(MSW_LIBS) \
- kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib \
- shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib winmm.lib libc.lib
+ oldnames.lib kernel32.lib user32.lib gdi32.lib advapi32.lib \
+ shell32.lib wsock32.lib winmm.lib winspool.lib $(LIBC_LIB)
 TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS) -base:0x1000000\
- -stack:0x800000 -entry:_start -subsystem:console\
+ -stack:0x800000 $(TEMACS_ENTRYPOINT) -subsystem:console\
  -pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map \
- -heap:0x00100000 -out:$@
-TEMACS_CPP_FLAGS= $(WARN_CPP_FLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \
+ -heap:0x00100000 -out:$@ -nodefaultlib
+TEMACS_CPP_FLAGS=-c \
+ $(CFLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \
  -DEMACS_MAJOR_VERSION=$(emacs_major_version) \
  -DEMACS_MINOR_VERSION=$(emacs_minor_version) \
  $(EMACS_BETA_VERSION) \
@@ -629,8 +780,6 @@ TEMACS_CPP_FLAGS= $(WARN_CPP_FLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \
  -DEMACS_CONFIGURATION=\"$(EMACS_CONFIGURATION)\" \
  -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\"
 
-TEMACS_FLAGS=-ML $(WARN_CPP_FALGS) $(OPT) -c $(TEMACS_CPP_FLAGS)
-
 !if $(HAVE_X)
 TEMACS_X_OBJS=\
 	$(OUTDIR)\balloon-x.obj \
@@ -653,7 +802,7 @@ TEMACS_X_OBJS=\
 	$(OUTDIR)\scrollbar-x.obj \
 	$(OUTDIR)\xgccache.obj \
 	$(OUTDIR)\xmu.obj \
-	$(OUTDIR)\xselect.obj
+	$(OUTDIR)\select-x.obj
 !endif
 
 !if $(HAVE_MSW)
@@ -663,6 +812,7 @@ TEMACS_MSW_OBJS=\
 	$(OUTDIR)\event-msw.obj \
 	$(OUTDIR)\frame-msw.obj \
 	$(OUTDIR)\glyphs-msw.obj \
+	$(OUTDIR)\gui-msw.obj \
 	$(OUTDIR)\menubar-msw.obj \
 	$(OUTDIR)\objects-msw.obj \
 	$(OUTDIR)\redisplay-msw.obj \
@@ -670,22 +820,38 @@ TEMACS_MSW_OBJS=\
 	$(OUTDIR)\select-msw.obj \
 	$(MSW_C_DIRED_OBJ) \
 	$(MSW_TOOLBAR_OBJ) \
-	$(MSW_DIALOG_OBJ)
+	$(MSW_DIALOG_OBJ) \
+	$(MSW_GIF_OBJ)
 !endif
 
-
 !if $(HAVE_MULE)
 TEMACS_MULE_OBJS=\
-	$(OUTDIR)\input-method-xlib.obj \
 	$(OUTDIR)\mule.obj \
 	$(OUTDIR)\mule-charset.obj \
-	$(OUTDIR)\mule-ccl.obj \
-	$(OUTDIR)\mule-coding.obj
+	$(OUTDIR)\mule-ccl.obj
+! if $(HAVE_X)
+TEMACS_MULE_OBJS=\
+	$(TEMACS_MULE_OBJS) $(OUTDIR)\input-method-xlib.obj
+! endif
 !endif
 
 !if $(DEBUG_XEMACS)
 TEMACS_DEBUG_OBJS=\
-	$(OUTDIR)\debug.obj
+	$(OUTDIR)\debug.obj \
+	$(OUTDIR)\tests.obj
+!endif
+
+!if !$(USE_SYSTEM_MALLOC)
+TEMACS_ALLOC_OBJS=\
+	$(OUTDIR)\free-hook.obj \
+	$(OUTDIR)\gmalloc.obj \
+	$(OUTDIR)\ntheap.obj \
+	$(OUTDIR)\vm-limit.obj
+!endif
+
+!if !$(USE_PORTABLE_DUMPER)
+TEMACS_DUMP_OBJS=\
+	$(OUTDIR)\unexnt.obj
 !endif
 
 TEMACS_OBJS= \
@@ -694,6 +860,8 @@ TEMACS_OBJS= \
 	$(TEMACS_CODING_OBJS)\
 	$(TEMACS_MULE_OBJS)\
 	$(TEMACS_DEBUG_OBJS)\
+	$(TEMACS_ALLOC_OBJS)\
+	$(TEMACS_DUMP_OBJS)\
 	$(OUTDIR)\abbrev.obj \
 	$(OUTDIR)\alloc.obj \
 	$(OUTDIR)\alloca.obj \
@@ -726,18 +894,17 @@ TEMACS_OBJS= \
 	$(OUTDIR)\faces.obj \
 	$(OUTDIR)\file-coding.obj \
 	$(OUTDIR)\fileio.obj \
-	$(OUTDIR)\filelock.obj \
 	$(OUTDIR)\filemode.obj \
 	$(OUTDIR)\floatfns.obj \
 	$(OUTDIR)\fns.obj \
 	$(OUTDIR)\font-lock.obj \
 	$(OUTDIR)\frame.obj \
-	$(OUTDIR)\free-hook.obj \
 	$(OUTDIR)\general.obj \
 	$(OUTDIR)\glyphs.obj \
 	$(OUTDIR)\glyphs-eimage.obj \
-	$(OUTDIR)\gmalloc.obj \
+	$(OUTDIR)\glyphs-widget.obj \
 	$(OUTDIR)\gui.obj \
+	$(OUTDIR)\gutter.obj \
 	$(OUTDIR)\hash.obj \
 	$(OUTDIR)\indent.obj \
 	$(OUTDIR)\imgproc.obj \
@@ -753,7 +920,6 @@ TEMACS_OBJS= \
 	$(OUTDIR)\md5.obj \
 	$(OUTDIR)\minibuf.obj \
 	$(OUTDIR)\nt.obj \
-	$(OUTDIR)\ntheap.obj \
 	$(OUTDIR)\ntplay.obj \
 	$(OUTDIR)\ntproc.obj \
 	$(OUTDIR)\objects.obj \
@@ -762,7 +928,6 @@ TEMACS_OBJS= \
 	$(OUTDIR)\process.obj \
 	$(OUTDIR)\process-nt.obj \
 	$(OUTDIR)\profile.obj \
-	$(OUTDIR)\pure.obj \
 	$(OUTDIR)\rangetab.obj \
 	$(OUTDIR)\realpath.obj \
 	$(OUTDIR)\redisplay-output.obj \
@@ -770,6 +935,7 @@ TEMACS_OBJS= \
 	$(OUTDIR)\regex.obj \
 	$(OUTDIR)\scrollbar.obj \
 	$(OUTDIR)\search.obj \
+	$(OUTDIR)\select.obj \
 	$(OUTDIR)\signal.obj \
 	$(OUTDIR)\sound.obj \
 	$(OUTDIR)\specifier.obj \
@@ -779,28 +945,31 @@ TEMACS_OBJS= \
 	$(OUTDIR)\sysdep.obj \
 	$(OUTDIR)\tparam.obj \
 	$(OUTDIR)\undo.obj \
-	$(OUTDIR)\unexnt.obj \
-	$(OUTDIR)\vm-limit.obj \
 	$(OUTDIR)\widget.obj \
 	$(OUTDIR)\window.obj \
-	$(NT)\xemacs.res
+	$(OUTDIR)\xemacs.res
 
 # Rules
 
 .SUFFIXES:
-.SUFFIXES:	.c
+.SUFFIXES:	.c .obj .texi .info
 
 # nmake rule
+!if $(DEBUG_XEMACS)
+{$(TEMACS_SRC)}.c{$(OUTDIR)}.obj:
+	$(CCV) $(TEMACS_CPP_FLAGS) $< -Fo$@ -Fr$*.sbr -Fd$(OUTDIR)\temacs.pdb
+!else
 {$(TEMACS_SRC)}.c{$(OUTDIR)}.obj:
-	$(CCV) $(TEMACS_FLAGS) $< -Fo$@ -Fr$*.sbr
+	$(CCV) $(TEMACS_CPP_FLAGS) $< -Fo$@
+!endif
 
 $(OUTDIR)\TopLevelEmacsShell.obj:	$(TEMACS_SRC)\EmacsShell-sub.c
-	$(CCV) $(TEMACS_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $** -Fo$@
+	$(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $** -Fo$@
 
 $(OUTDIR)\TransientEmacsShell.obj: $(TEMACS_SRC)\EmacsShell-sub.c
-	$(CCV) $(TEMACS_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $** -Fo$@
+	$(CCV) $(TEMACS_CPP_FLAGS) -DDEFINE_TRANSIENT_EMACS_SHELL $** -Fo$@
 
-$(OUTDIR)\pure.obj: $(TEMACS_SRC)\pure.c $(TEMACS_SRC)\puresize-adjust.h
+$(OUTDIR)\alloc.obj: $(TEMACS_SRC)\alloc.c
 
 #$(TEMACS_SRC)\Emacs.ad.h: $(XEMACS)\etc\Emacs.ad
 #	!"sed -f ad2c.sed < $(XEMACS)\etc\Emacs.ad > $(TEMACS_SRC)\Emacs.ad.h"
@@ -809,18 +978,243 @@ $(OUTDIR)\pure.obj: $(TEMACS_SRC)\pure.c $(TEMACS_SRC)\puresize-adjust.h
 #	!"cd $(TEMACS_SRC); cp paths.h.in paths.h"
 
 $(TEMACS): $(TEMACS_INCLUDES) $(TEMACS_OBJS)
+!if $(DEBUG_XEMACS)
+	@dir /b/s $(OUTDIR)\*.sbr > bscmake.tmp
+	bscmake -nologo -o$(TEMACS_BROWSE) @bscmake.tmp
+	@$(DEL) bscmake.tmp
+!endif
+!if $(USE_PORTABLE_DUMPER)
+	@if exist $(TEMACS_DIR)\xemacs.dmp del $(TEMACS_DIR)\xemacs.dmp
+!endif
 	link.exe @<<
   $(TEMACS_LFLAGS) $(TEMACS_OBJS) $(TEMACS_LIBS)
 <<
 
-$(NT)\xemacs.res: xemacs.rc
-	rc xemacs.rc
+$(OUTDIR)\xemacs.res: xemacs.rc
+	rc -Fo$@ xemacs.rc
 
-# MSDEV Source Broswer file. "*.sbr" is too inclusive but this is harmless
-$(TEMACS_BROWSE): $(TEMACS_OBJS)
-	@dir /b/s $(OUTDIR)\*.sbr > bscmake.tmp
-	bscmake -nologo -o$@ @bscmake.tmp
-	@del bscmake.tmp
+# Section handling automated tests starts here
+
+SRCDIR=$(MAKEDIR)\..\src
+PROGNAME=$(SRCDIR)\xemacs.exe
+blddir=$(MAKEDIR:\=\\)\\..
+temacs_loadup=$(TEMACS) -batch -l $(SRCDIR)/../lisp/loadup.el
+dump_temacs   = $(temacs_loadup) dump
+run_temacs    = $(temacs_loadup) run-temacs
+## We have automated tests!!
+testdir=../tests/automated
+batch_test_emacs=-batch -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir)
+
+# .PHONY: check check-temacs
+
+check:
+	cd $(SRCDIR)
+	$(PROGNAME) $(batch_test_emacs)
+
+check-temacs:
+	cd $(SRCDIR)
+	set EMACSBOOTSTRAPLOADPATH=$(LISP)
+	set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
+	$(run_temacs) $(batch_test_emacs)
+
+# Section handling automated tests ends here
+
+# Section handling info starts here
+
+!if !defined(MAKEINFO)
+MAKEINFO=$(PROGNAME) -vanilla -batch -l texinfmt -f batch-texinfo-format
+!endif
+
+MANDIR = $(XEMACS)\man
+INFODIR = $(XEMACS)\info
+INFO_FILES= \
+	$(INFODIR)\cl.info \
+	$(INFODIR)\custom.info \
+	$(INFODIR)\emodules.info \
+	$(INFODIR)\external-widget.info \
+	$(INFODIR)\info.info \
+	$(INFODIR)\standards.info \
+	$(INFODIR)\term.info \
+	$(INFODIR)\termcap.info \
+	$(INFODIR)\texinfo.info \
+	$(INFODIR)\widget.info \
+	$(INFODIR)\xemacs-faq.info \
+	$(INFODIR)\xemacs.info \
+	$(INFODIR)\lispref.info \
+	$(INFODIR)\new-users-guide.info \
+	$(INFODIR)\internals.info
+
+{$(MANDIR)}.texi{$(INFODIR)}.info:
+	cd $(MANDIR)
+	$(MAKEINFO) $**
+
+XEMACS_SRCS = \
+	$(MANDIR)\xemacs\abbrevs.texi \
+	$(MANDIR)\xemacs\basic.texi \
+	$(MANDIR)\xemacs\buffers.texi \
+	$(MANDIR)\xemacs\building.texi \
+	$(MANDIR)\xemacs\calendar.texi \
+	$(MANDIR)\xemacs\cmdargs.texi \
+	$(MANDIR)\xemacs\custom.texi \
+	$(MANDIR)\xemacs\display.texi \
+	$(MANDIR)\xemacs\entering.texi \
+	$(MANDIR)\xemacs\files.texi \
+	$(MANDIR)\xemacs\fixit.texi \
+	$(MANDIR)\xemacs\frame.texi \
+	$(MANDIR)\xemacs\glossary.texi \
+	$(MANDIR)\xemacs\gnu.texi \
+	$(MANDIR)\xemacs\help.texi \
+	$(MANDIR)\xemacs\indent.texi \
+	$(MANDIR)\xemacs\keystrokes.texi \
+	$(MANDIR)\xemacs\killing.texi \
+	$(MANDIR)\xemacs\m-x.texi \
+	$(MANDIR)\xemacs\major.texi \
+	$(MANDIR)\xemacs\mark.texi \
+	$(MANDIR)\xemacs\menus.texi \
+	$(MANDIR)\xemacs\mini.texi \
+	$(MANDIR)\xemacs\misc.texi \
+	$(MANDIR)\xemacs\mouse.texi \
+	$(MANDIR)\xemacs\mule.texi \
+	$(MANDIR)\xemacs\new.texi \
+	$(MANDIR)\xemacs\packages.texi \
+	$(MANDIR)\xemacs\picture.texi \
+	$(MANDIR)\xemacs\programs.texi \
+	$(MANDIR)\xemacs\reading.texi \
+	$(MANDIR)\xemacs\regs.texi \
+	$(MANDIR)\xemacs\search.texi \
+	$(MANDIR)\xemacs\sending.texi \
+	$(MANDIR)\xemacs\startup.texi \
+	$(MANDIR)\xemacs\text.texi \
+	$(MANDIR)\xemacs\trouble.texi \
+	$(MANDIR)\xemacs\undo.texi \
+	$(MANDIR)\xemacs\windows.texi \
+	$(MANDIR)\xemacs\xemacs.texi
+
+LISPREF_SRCS = \
+	$(MANDIR)\lispref\abbrevs.texi \
+	$(MANDIR)\lispref\annotations.texi \
+	$(MANDIR)\lispref\back.texi \
+	$(MANDIR)\lispref\backups.texi \
+	$(MANDIR)\lispref\buffers.texi \
+	$(MANDIR)\lispref\building.texi \
+	$(MANDIR)\lispref\commands.texi \
+	$(MANDIR)\lispref\compile.texi \
+	$(MANDIR)\lispref\consoles-devices.texi \
+	$(MANDIR)\lispref\control.texi \
+	$(MANDIR)\lispref\customize.texi \
+	$(MANDIR)\lispref\databases.texi \
+	$(MANDIR)\lispref\debugging.texi \
+	$(MANDIR)\lispref\dialog.texi \
+	$(MANDIR)\lispref\display.texi \
+	$(MANDIR)\lispref\dragndrop.texi \
+	$(MANDIR)\lispref\edebug-inc.texi \
+	$(MANDIR)\lispref\edebug.texi \
+	$(MANDIR)\lispref\errors.texi \
+	$(MANDIR)\lispref\eval.texi \
+	$(MANDIR)\lispref\extents.texi \
+	$(MANDIR)\lispref\faces.texi \
+	$(MANDIR)\lispref\files.texi \
+	$(MANDIR)\lispref\frames.texi \
+	$(MANDIR)\lispref\functions.texi \
+	$(MANDIR)\lispref\glyphs.texi \
+	$(MANDIR)\lispref\hash-tables.texi \
+	$(MANDIR)\lispref\help.texi \
+	$(MANDIR)\lispref\hooks.texi \
+	$(MANDIR)\lispref\index.texi \
+	$(MANDIR)\lispref\internationalization.texi \
+	$(MANDIR)\lispref\intro.texi \
+	$(MANDIR)\lispref\keymaps.texi \
+	$(MANDIR)\lispref\ldap.texi \
+	$(MANDIR)\lispref\lispref.texi \
+	$(MANDIR)\lispref\lists.texi \
+	$(MANDIR)\lispref\loading.texi \
+	$(MANDIR)\lispref\locals.texi \
+	$(MANDIR)\lispref\macros.texi \
+	$(MANDIR)\lispref\maps.texi \
+	$(MANDIR)\lispref\markers.texi \
+	$(MANDIR)\lispref\menus.texi \
+	$(MANDIR)\lispref\minibuf.texi \
+	$(MANDIR)\lispref\modes.texi \
+	$(MANDIR)\lispref\mouse.texi \
+	$(MANDIR)\lispref\mule.texi \
+	$(MANDIR)\lispref\numbers.texi \
+	$(MANDIR)\lispref\objects.texi \
+	$(MANDIR)\lispref\os.texi \
+	$(MANDIR)\lispref\positions.texi \
+	$(MANDIR)\lispref\processes.texi \
+	$(MANDIR)\lispref\range-tables.texi \
+	$(MANDIR)\lispref\scrollbars.texi \
+	$(MANDIR)\lispref\searching.texi \
+	$(MANDIR)\lispref\sequences.texi \
+	$(MANDIR)\lispref\specifiers.texi \
+	$(MANDIR)\lispref\streams.texi \
+	$(MANDIR)\lispref\strings.texi \
+	$(MANDIR)\lispref\symbols.texi \
+	$(MANDIR)\lispref\syntax.texi \
+	$(MANDIR)\lispref\text.texi \
+	$(MANDIR)\lispref\tips.texi \
+	$(MANDIR)\lispref\toolbar.texi \
+	$(MANDIR)\lispref\tooltalk.texi \
+	$(MANDIR)\lispref\variables.texi \
+	$(MANDIR)\lispref\windows.texi \
+	$(MANDIR)\lispref\x-windows.texi
+
+INTERNALS_SRCS = \
+	$(MANDIR)\internals\internals.texi \
+	$(MANDIR)\internals\index.texi
+
+NEW_USERS_GUIDE_SRCS = \
+	$(MANDIR)\new-users-guide\custom1.texi \
+	$(MANDIR)\new-users-guide\custom2.texi \
+	$(MANDIR)\new-users-guide\edit.texi \
+	$(MANDIR)\new-users-guide\enter.texi \
+	$(MANDIR)\new-users-guide\files.texi \
+	$(MANDIR)\new-users-guide\help.texi \
+	$(MANDIR)\new-users-guide\modes.texi \
+	$(MANDIR)\new-users-guide\new-users-guide.texi \
+	$(MANDIR)\new-users-guide\region.texi \
+	$(MANDIR)\new-users-guide\search.texi \
+	$(MANDIR)\new-users-guide\xmenu.texi
+
+$(INFODIR)\xemacs.info: $(XEMACS_SRCS)
+	cd $(MANDIR)\xemacs
+	$(MAKEINFO) xemacs.texi
+	cd ..
+
+
+$(INFODIR)\lispref.info: $(LISPREF_SRCS)
+	cd $(MANDIR)\lispref
+	$(MAKEINFO) lispref.texi
+	cd ..
+
+$(INFODIR)\internals.info: $(INTERNALS_SRCS)
+	cd $(MANDIR)\internals
+	$(MAKEINFO) internals.texi
+	cd ..
+
+$(INFODIR)\new-users-guide.info: $(NEW_USERS_GUIDE_SRCS)
+	cd $(MANDIR)\new-users-guide
+	$(MAKEINFO) new-users-guide.texi
+	cd ..
+
+info:	makeinfo-test $(INFO_FILES)
+
+makeinfo-test:
+	@<<makeinfo_test.bat
+@echo off
+if exist "$(MAKEINFO)" goto test_done
+@"$(PROGNAME)" -batch -vanilla -eval "(condition-case nil (require (quote texinfo)) (t (kill-emacs 1)))"
+@if not errorlevel 1 goto suggest_makeinfo
+@echo XEmacs `info' cannot be built!
+@echo Install XEmacs package `texinfo' (see README.packages).
+:suggest_makeinfo
+@echo Consider specifying path to makeinfo program: MAKEINFO=path
+@echo as this will build info docs faster than XEmacs using `texinfo'.
+@if errorlevel 1 exit 1
+:test_done
+<<NOKEEP
+
+# Section handling info ends here
 
 #------------------------------------------------------------------------------
 
@@ -828,8 +1222,15 @@ $(TEMACS_BROWSE): $(TEMACS_OBJS)
 
 LOADPATH=$(LISP)
 
+# Rebuild docfile target
+docfile ::
+	if exist $(DOC) del $(DOC)
+docfile :: $(DOC)
+
 $(DOC): $(LIB_SRC)\make-docfile.exe
-	-del $(DOC)
+	if exist $(DOC) del $(DOC)
+	set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
+	set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
 	$(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages
 	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1)
 	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC2)
@@ -840,81 +1241,229 @@ $(DOC): $(LIB_SRC)\make-docfile.exe
 	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC7)
 	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC8)
 	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC9)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC10)
+	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC11)
 
-$(LISP)\Installation.el: Installation.el
-	copy Installation.el $(LISP)
-
-update-elc: $(LISP)\Installation.el
-	set EMACSBOOTSTRAPLOADPATH=$(LISP)
+update-elc:
+	set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
+	set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
 	$(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\update-elc.el
 
 # This rule dumps xemacs and then possibly spawns sub-make if PURESPACE
-# requirements has changed.
-dump-xemacs: $(TEMACS)
+# requirements have changed.
+dump-xemacs: temacs
 	@echo >$(TEMACS_DIR)\SATISFIED
 	cd $(TEMACS_DIR)
-	set EMACSBOOTSTRAPLOADPATH=$(LISP)
+	set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
+	set EMACSBOOTSTRAPMODULEPATH=$(MODULES)
 	-1 $(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\loadup.el dump
-	@cd $(NT)
+!if $(USE_PORTABLE_DUMPER)
+	copy temacs.exe xemacs.exe
+!endif
+	cd $(NT)
 	@if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@
-
 #------------------------------------------------------------------------------
 
 # use this rule to build the complete system
-all:	$(OUTDIR)\nul $(LASTFILE) $(LWLIB) $(LIB_SRC_TOOLS) $(RUNEMACS) \
-	$(TEMACS) $(TEMACS_BROWSE) update-elc $(DOC) dump-xemacs
+all:	$(XEMACS)\Installation $(OUTDIR)\nul $(LASTFILE) $(LWLIB) \
+	$(LIB_SRC_TOOLS) $(RUNEMACS) $(TEMACS) update-elc $(DOC) dump-xemacs \
+	$(LISP)/auto-autoloads.el $(LISP)/custom-load.el info
 
-temacs: $(TEMACS)
+temacs: $(LASTFILE) $(TEMACS)
 
 # use this rule to install the system
-install:	all "$(INSTALL_DIR)\nul" "$(INSTALL_DIR)\lock\nul"
+install:	all
+	cd $(NT)
+	@echo Installing in $(INSTALL_DIR) ...
+	@echo PlaceHolder > PlaceHolder
+	@xcopy /q PROBLEMS "$(INSTALL_DIR)\"
+	@xcopy /q PlaceHolder "$(INSTALL_DIR)\lock\"
+	@$(DEL) "$(INSTALL_DIR)\lock\PlaceHolder"
 	@xcopy /q $(LIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
-	@copy $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
-	@copy $(XEMACS)\src\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
-	@copy $(RUNEMACS) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
+	@copy $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
+	@copy $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
+	@copy $(XEMACS)\src\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
+	@copy $(RUNEMACS) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
 	@xcopy /e /q $(XEMACS)\etc  "$(INSTALL_DIR)\etc\"
 	@xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\"
 	@xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
-
-"$(INSTALL_DIR)\nul":
-	-@mkdir "$(INSTALL_DIR)"
-
-"$(INSTALL_DIR)\lock\nul":	"$(INSTALL_DIR)\nul"
-	-@mkdir "$(INSTALL_DIR)\lock"
+	@echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
+	@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
+	@$(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder"
+	@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\"
+	@$(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder"
+	@xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
+	@$(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder"
+	@$(DEL) PlaceHolder
 
 distclean:
-	del *.bak
-	del *.orig
-	del *.rej
-	del *.pdb
-	del *.tmp
+	$(DEL) *.bak
+	$(DEL) *.orig
+	$(DEL) *.rej
+	$(DEL) *.tmp
+	$(DEL) $(XEMACS)\Installation
 	cd $(OUTDIR)
-	del *.obj
-	del *.sbr
-	del *.lib
+	$(DEL) *.lib
+	$(DEL) *.obj
+	$(DEL) *.pdb
+	$(DEL) *.res
+	$(DEL) *.sbr
 	cd $(XEMACS)\$(TEMACS_DIR)
-	del puresize-adjust.h
-	del config.h
-	del paths.h
-	del Emacs.ad.h
-	del *.bak
-	del *.orig
-	del *.rej
-	del *.exe
-	del *.map
-	del *.bsc
-	del *.pdb
+	$(DEL) config.h
+	$(DEL) paths.h
+	$(DEL) Emacs.ad.h
+	$(DEL) *.bak
+	$(DEL) *.orig
+	$(DEL) *.rej
+	$(DEL) *.exe
+	$(DEL) *.map
+	$(DEL) *.bsc
+	$(DEL) *.pdb
 	cd $(LIB_SRC)
-	del DOC
-	del *.bak
-	del *.orig
-	del *.rej
-	del *.exe
+	$(DEL) DOC
+	$(DEL) *.bak
+	$(DEL) *.orig
+	$(DEL) *.rej
+	$(DEL) *.exe
+	$(DEL) *.obj
+	$(DEL) *.pdb
+	$(DEL) *.res
+	$(DEL) $(CONFIG_VALUES)
 	cd $(LISP)
-	-del /s /q *.bak *.elc *.orig *.rej
+	$(DEL) /s /q *.bak *.elc *.orig *.rej
+	cd $(INFODIR)
+	$(DEL) *.info*
 
 depend:
-	mkdepend -f xemacs.mak -p$(OUTDIR)\ -o.obj -w9999 -- $(TEMACS_CPP_FLAGS) --  $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(LASTFILE_SRC)\lastfile.c $(LIB_SRC)\make-docfile.c .\runemacs.c
+	cd $(SRCDIR)
+	perl ./make-src-depend > depend.tmp
+	perl -MFile::Compare -e "compare('depend.tmp', 'depend') && rename('depend.tmp', 'depend') or unlink('depend.tmp')"
+
+installation::
+	@if exist $(XEMACS)\Installation del $(XEMACS)\Installation
+
+installation:: $(XEMACS)\Installation
+
+$(XEMACS)\Installation:
+	@type > $(XEMACS)\Installation <<
+!if defined(OS)
+OS: $(OS)
+!endif
+
+XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") configured for `$(EMACS_CONFIGURATION)'.
+
+  Building XEmacs in \"$(MAKEDIR:\=\\)\".
+!if defined(CCV)
+  Using compiler \"$(CC) $(CFLAGS)\".
+!endif
+  Installing XEmacs in \"$(INSTALL_DIR:\=\\)\".
+  Package path is $(PATH_PACKAGEPATH:"=\").
+!if $(INFODOCK)
+  Building InfoDock.
+!endif
+!if $(HAVE_MSW)
+  Compiling in support for Microsoft Windows native GUI.
+!endif
+!if $(HAVE_X)
+  Compiling in support for X-Windows.
+!endif
+!if $(HAVE_MULE)
+  Compiling in MULE.
+!endif
+!if $(HAVE_XPM)
+  Compiling in support for XPM images.
+!else
+  --------------------------------------------------------------------
+  WARNING: Compiling without XPM support.
+  WARNING: You should strongly consider installing XPM.
+  WARNING: Otherwise toolbars and other graphics will look suboptimal.
+  WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux)
+  --------------------------------------------------------------------
+!endif
+!if $(HAVE_GIF)
+  Compiling in support for GIF images.
+!endif
+!if $(HAVE_PNG)
+  Compiling in support for PNG images.
+!else
+  --------------------------------------------------------------------
+  WARNING: Compiling without PNG image support.
+  WARNING: You should strongly consider installing the PNG libraries.
+  WARNING: Otherwise certain images and glyphs may not display.
+  WARNING: (a copy may be found in ftp://ftp.xemacs.org/pub/xemacs/aux
+  --------------------------------------------------------------------
+!endif
+!if $(HAVE_TIFF)
+  Compiling in support for TIFF images.
+!endif
+!if $(HAVE_JPEG)
+  Compiling in support for JPEG images.
+!endif
+!if $(HAVE_XFACE)
+  Compiling in support for X-Face message headers.
+!endif
+!if $(HAVE_TOOLBARS)
+  Compiling in support for toolbars.
+!endif
+!if $(HAVE_DIALOGS)
+  Compiling in support for dialogs.
+!endif
+!if $(HAVE_WIDGETS)
+  Compiling in support for widgets.
+!endif
+!if $(HAVE_NATIVE_SOUND)
+  Compiling in support for native sounds.
+!endif
+!if $(HAVE_MSW_C_DIRED)
+  Compiling in fast dired implementation.
+!else
+  --------------------------------------------------------------------
+  WARNING: Define HAVE_MSW_C_DIRED to be non-zero if you want XEmacs
+  WARNING: to use C primitives to significantly speed up dired, at the
+  WARNING: expense of an additional ~4KB of code.
+  --------------------------------------------------------------------
+!endif
+!if $(USE_MINIMAL_TAGBITS)
+  Using minimal tagbits.
+!endif
+!if $(USE_INDEXED_LRECORD_IMPLEMENTATION)
+  Using indexed lrecord implementation.
+!endif
+!if $(USE_UNION_TYPE)
+  Using union type for Lisp object storage.
+!endif
+!if $(USE_PORTABLE_DUMPER)
+  Using portable dumper.
+!endif
+!if $(USE_SYSTEM_MALLOC)
+  Using system malloc.
+!endif
+!if $(USE_CRTDLL)
+  Using DLL version of C runtime library
+!endif
+!if $(DEBUG_XEMACS)
+  Compiling in extra debug checks. XEmacs will be slow!
+!endif
+<<NOKEEP
+	@echo --------------------------------------------------------------------
+	@type $(XEMACS)\Installation
+	@echo --------------------------------------------------------------------
+
+# Update auto-autoloads.el and custom-load.el similar to what
+# XEmacs.rules does for xemacs-packages.
+VANILLA=-vanilla
+FORCE:
+$(LISP)\auto-autoloads.el:	FORCE
+	@$(DEL) $(LISP)\auto-autoloads.el
+	$(PROGNAME) $(VANILLA) -batch \
+		-l autoload -f batch-update-directory $(LISP)
+	$(PROGNAME) $(VANILLA) -batch \
+		-f batch-byte-compile $@
+	@$(DEL) $(LISP)\auto-autoloads.el~
+
+$(LISP)\custom-load.el:	FORCE
+	$(PROGNAME) $(VANILLA) -batch -l cus-dep \
+		-f Custom-make-dependencies $(LISP)
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.