X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=nt%2Fxemacs.mak;h=9cff2b0634c4d4fef92fe5caff9d8f2a611a19d3;hp=c3ff3bb13893eb19e8f2099ebebcab82cd828044;hb=113b194be934327de99a168d809271db252c07c4;hpb=35adcaaeafb1fe93eaf00c39b48619e8f188ff3f

diff --git a/nt/xemacs.mak b/nt/xemacs.mak
index c3ff3bb..9cff2b0 100644
--- a/nt/xemacs.mak
+++ b/nt/xemacs.mak
@@ -26,7 +26,9 @@
 
 XEMACS=..
 LISP=$(XEMACS)\lisp
+MODULES=$(XEMACS)\modules
 NT=$(XEMACS)\nt
+OUTDIR=$(NT)\obj
 
 # Program name and version
 
@@ -65,20 +67,26 @@ 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
@@ -91,6 +99,9 @@ HAVE_TIFF=0
 !if !defined(HAVE_JPEG)
 HAVE_JPEG=0
 !endif
+!if !defined(HAVE_XFACE)
+HAVE_XFACE=0
+!endif
 !if !defined(HAVE_GIF)
 HAVE_GIF=1
 !endif
@@ -122,10 +133,11 @@ USE_INDEXED_LRECORD_IMPLEMENTATION=0
 #
 # 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"
@@ -196,8 +208,16 @@ CONFIG_ERROR=1
 !message Specified JPEG directory does not contain "$(JPEG_DIR)\libjpeg.lib"
 CONFIG_ERROR=1
 !endif
+!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 $(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 $(HAVE_MSW) && $(HAVE_TOOLBARS) && !$(HAVE_XPM)
-!error Toolbars require XPM support
+!message Toolbars require XPM support
 CONFIG_ERROR=1
 !endif
 !if $(CONFIG_ERROR)
@@ -213,94 +233,24 @@ 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 XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename) 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.
-!endif
-!if $(HAVE_X)
-!message Compiling in support for X-Windows.
-!endif
-!if $(HAVE_MULE)
-!message Compiling in MULE.
-!endif
-!if $(HAVE_XPM)
-!message Compiling in support for XPM images.
-!endif
-!if $(HAVE_GIF)
-!message Compiling in support for GIF images.
-!endif
-!if $(HAVE_PNG)
-!message Compiling in support for PNG images.
-!endif
-!if $(HAVE_TIFF)
-!message Compiling in support for TIFF images.
-!endif
-!if $(HAVE_JPEG)
-!message Compiling in support for JPEG images.
-!endif
-!if $(HAVE_TOOLBARS)
-!message Compiling in support for toolbars.
-!endif
-!if $(HAVE_DIALOGS)
-!message Compiling in support for dialogs.
-!endif
-!if $(HAVE_NATIVE_SOUND)
-!message Compiling in support for native sounds.
-!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.
-!endif
-!if $(USE_MINIMAL_TAGBITS)
-!message Using minimal tagbits.
-!endif
-!if $(USE_INDEXED_LRECORD_IMPLEMENTATION)
-!message Using indexed lrecord implementation.
-!endif
-!if $(USE_UNION_TYPE)
-!message Using union type for Lisp object storage.
-!endif
-!if $(DEBUG_XEMACS)
-!message Compiling in extra debug checks. XEmacs will be slow!
-!endif
-!message ------------------------------------------------
-!message 
-!endif # !defined(CONF_REPORT_ALREADY_PRINTED)
-
-#
 # Compiler command echo control. Define VERBOSECC=1 to get vebose 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
 
-WARN_CPP_FLAGS = -W3
+CFLAGS=-nologo -W3 $(OPT)
 
 !if $(HAVE_X)
 X_DEFINES=-DHAVE_X_WINDOWS
@@ -342,6 +292,11 @@ 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
@@ -364,7 +319,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)
@@ -396,49 +351,6 @@ DEFINES=$(X_DEFINES) $(MSW_DEFINES) $(MULE_DEFINES) \
 	-DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN -DWINDOWSNT -Demacs \
 	-DHAVE_CONFIG_H $(PROGRAM_DEFINES) $(PATH_DEFINES)
 
-OUTDIR=obj
-
-#
-# Creating simplified versions of Installation and Installation.el
-#
-# Some values cannot be written on the same line with
-# their key, since they cannot be put inside an echo command.
-# Macro substitution (:"=\", :\=\\) can be performed on values in order
-# to create a legal string in LISP for Installation.el.
-#
-!if [echo OS: $(OS)>Installation] ||\
-[echo XEmacs $(XEMACS_VERSION_STRING) $(xemacs_codename:"=\") configured for ^`$(EMACS_CONFIGURATION)^'.>>Installation] ||\
-[echo Where should the build process find the source code?>>Installation] ||\
-[echo $(MAKEDIR:\=\\)>>Installation]
-!endif
-# Compiler Information
-!if defined(CCV) &&\
-[echo What compiler should XEmacs be built with?>>Installation] &&\
-[echo $(CCV)>>Installation]
-!endif
-# Window System Information
-!if [echo What window system should XEmacs use?>>Installation]
-!endif
-!if (defined (HAVE_X) && $(HAVE_X) == 1)
-!if [echo X11>>Installation]
-!endif
-!endif
-!if (defined (HAVE_MSW) && $(HAVE_MSW) == 1)
-!if [echo MS Windows>>Installation]
-!endif
-!endif
-!if (!defined (HAVE_MSW) && !defined (HAVE_X))
-!if [echo Please specify at least one HAVE_MSW^=1 and^/or HAVE_X^=1>>Installation]
-!endif
-!endif
-# Creation of Installation.el
-!if [type Installation] ||\
-[echo (setq Installation-string ^">Installation.el] ||\
-[type Installation >>Installation.el] ||\
-[echo ^")>>Installation.el]
-!endif
-
-
 #------------------------------------------------------------------------------
 
 default: $(OUTDIR)\nul all 
@@ -449,8 +361,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
@@ -461,9 +372,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
@@ -478,17 +386,18 @@ 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 ^"$(MAKEDIR:\=\\)\\..^">>$(CONFIG_VALUES)]
+#!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)]
+!if [echo CC>>$(CONFIG_VALUES) && echo "$(CC:\=\\)">>$(CONFIG_VALUES)]
 !endif
-!if [echo CFLAGS>>$(CONFIG_VALUES) && echo ^"$(CFLAGS:\=\\)^">>$(CONFIG_VALUES)]
+!if [echo CFLAGS>>$(CONFIG_VALUES) && echo "$(CFLAGS:\=\\)">>$(CONFIG_VALUES)]
 !endif
-!if [echo CPP>>$(CONFIG_VALUES) && echo ^"$(CPP:\=\\)^">>$(CONFIG_VALUES)]
+!if [echo CPP>>$(CONFIG_VALUES) && echo "$(CPP:\=\\)">>$(CONFIG_VALUES)]
 !endif
-!if [echo CPPFLAGS>>$(CONFIG_VALUES) && echo ^"$(CPPFLAGS:\=\\)^">>$(CONFIG_VALUES)]
+!if [echo CPPFLAGS>>$(CONFIG_VALUES) && echo "$(CPPFLAGS:\=\\)">>$(CONFIG_VALUES)]
 !endif
-!if [echo LISPDIR>>$(CONFIG_VALUES) && echo ^"$(MAKEDIR:\=\\)\\$(LISP:\=\\)^">>$(CONFIG_VALUES)]
+!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)]
@@ -497,13 +406,16 @@ CONFIG_VALUES = $(LIB_SRC)\config.values
 # 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$@ $**
+	$(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)
 $(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_TOOLS = \
 	$(LIB_SRC)/make-docfile.exe	\
@@ -516,12 +428,15 @@ LIB_SRC_TOOLS = \
 
 #------------------------------------------------------------------------------
 
-# 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$@ $**
 
 #------------------------------------------------------------------------------
 
@@ -529,7 +444,7 @@ $(RUNEMACS): $(NT)\runemacs.c $(NT)\xemacs.res
 
 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
 
@@ -547,7 +462,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
@@ -561,7 +476,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) $**
@@ -632,6 +547,7 @@ DOC_SRC3=\
  $(XEMACS)\src\general.c \
  $(XEMACS)\src\glyphs.c \
  $(XEMACS)\src\glyphs-eimage.c \
+ $(XEMACS)\src\glyphs-widget.c \
  $(XEMACS)\src\gmalloc.c \
  $(XEMACS)\src\gui.c  \
  $(XEMACS)\src\hash.c \
@@ -665,8 +581,8 @@ DOC_SRC4=\
  $(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=\
@@ -705,7 +621,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)
@@ -715,6 +631,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 \
@@ -728,11 +645,13 @@ DOC_SRC7=\
 
 !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
+! if $(HAVE_X)
+ DOC_SRC8=$(DOC_SRC8) $(XEMACS)\src\input-method-xlib.c
+! endif
 !endif
 
 !if $(DEBUG_XEMACS)
@@ -754,13 +673,14 @@ 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
+ kernel32.lib user32.lib gdi32.lib advapi32.lib \
+ shell32.lib wsock32.lib winmm.lib libc.lib
 TEMACS_LFLAGS=-nologo $(LIBRARIES) $(DEBUG_FLAGS) -base:0x1000000\
  -stack:0x800000 -entry:_start -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) \
+TEMACS_CPP_FLAGS=-ML -c \
+ $(CFLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \
  -DEMACS_MAJOR_VERSION=$(emacs_major_version) \
  -DEMACS_MINOR_VERSION=$(emacs_minor_version) \
  $(EMACS_BETA_VERSION) \
@@ -768,8 +688,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 \
@@ -792,7 +710,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)
@@ -802,6 +720,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 \
@@ -815,11 +734,14 @@ TEMACS_MSW_OBJS=\
 
 !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
+! if $(HAVE_X)
+TEMACS_MULE_OBJS=\
+	$(TEMACS_MULE_OBJS) $(OUTDIR)\input-method-xlib.obj
+! endif
 !endif
 
 !if $(DEBUG_XEMACS)
@@ -874,6 +796,7 @@ TEMACS_OBJS= \
 	$(OUTDIR)\general.obj \
 	$(OUTDIR)\glyphs.obj \
 	$(OUTDIR)\glyphs-eimage.obj \
+	$(OUTDIR)\glyphs-widget.obj \
 	$(OUTDIR)\gmalloc.obj \
 	$(OUTDIR)\gui.obj \
 	$(OUTDIR)\hash.obj \
@@ -907,6 +830,7 @@ TEMACS_OBJS= \
 	$(OUTDIR)\regex.obj \
 	$(OUTDIR)\scrollbar.obj \
 	$(OUTDIR)\search.obj \
+	$(OUTDIR)\select.obj \
 	$(OUTDIR)\signal.obj \
 	$(OUTDIR)\sound.obj \
 	$(OUTDIR)\specifier.obj \
@@ -920,7 +844,7 @@ TEMACS_OBJS= \
 	$(OUTDIR)\vm-limit.obj \
 	$(OUTDIR)\widget.obj \
 	$(OUTDIR)\window.obj \
-	$(NT)\xemacs.res
+	$(OUTDIR)\xemacs.res
 
 # Rules
 
@@ -928,16 +852,21 @@ TEMACS_OBJS= \
 .SUFFIXES:	.c
 
 # nmake rule
+!if $(DEBUG_XEMACS)
 {$(TEMACS_SRC)}.c{$(OUTDIR)}.obj:
-	$(CCV) $(TEMACS_FLAGS) $< -Fo$@ -Fr$*.sbr
+	$(CCV) $(TEMACS_CPP_FLAGS) $< -Fo$@ -Fr$*.sbr -Fd$(OUTDIR)\temacs.pdb
+!else
+{$(TEMACS_SRC)}.c{$(OUTDIR)}.obj:
+	$(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)\alloc.obj: $(TEMACS_SRC)\alloc.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"
@@ -946,18 +875,17 @@ $(OUTDIR)\alloc.obj: $(TEMACS_SRC)\alloc.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
 	link.exe @<<
   $(TEMACS_LFLAGS) $(TEMACS_OBJS) $(TEMACS_LIBS)
 <<
 
-$(NT)\xemacs.res: xemacs.rc
-	rc 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
+$(OUTDIR)\xemacs.res: xemacs.rc
+	rc -Fo$@ xemacs.rc
 
 #------------------------------------------------------------------------------
 
@@ -978,11 +906,9 @@ $(DOC): $(LIB_SRC)\make-docfile.exe
 	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC8)
 	$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC9)
 
-$(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
@@ -990,7 +916,7 @@ update-elc: $(LISP)\Installation.el
 dump-xemacs: $(TEMACS)
 	@echo >$(TEMACS_DIR)\SATISFIED
 	cd $(TEMACS_DIR)
-	set EMACSBOOTSTRAPLOADPATH=$(LISP)
+	set EMACSBOOTSTRAPLOADPATH=$(LISP);$(PACKAGE_PATH)
 	-1 $(TEMACS) -batch -l $(TEMACS_DIR)\..\lisp\loadup.el dump
 	@cd $(NT)
 	@if not exist $(TEMACS_DIR)\SATISFIED nmake -nologo -f xemacs.mak $@
@@ -998,17 +924,18 @@ dump-xemacs: $(TEMACS)
 #------------------------------------------------------------------------------
 
 # 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:	Installation $(OUTDIR)\nul $(LASTFILE) $(LWLIB) $(LIB_SRC_TOOLS) $(RUNEMACS) \
+	$(TEMACS) update-elc $(DOC) dump-xemacs
 
 temacs: $(TEMACS)
 
 # use this rule to install the system
 install:	all
 	@echo Installing in $(INSTALL_DIR) ...
+	@echo PlaceHolder > PlaceHolder
 	@xcopy /q PROBLEMS "$(INSTALL_DIR)\"
-	@xcopy /q README "$(INSTALL_DIR)\lock\"
-	@del "$(INSTALL_DIR)\lock\README"
+	@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 $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
@@ -1017,19 +944,28 @@ install:	all
 	@xcopy /e /q $(XEMACS)\etc  "$(INSTALL_DIR)\etc\"
 	@xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\"
 	@xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
+	@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 Installation
 	cd $(OUTDIR)
+	del *.lib
 	del *.obj
+	del *.pdb
+	del *.res
 	del *.sbr
-	del *.lib
 	cd $(XEMACS)\$(TEMACS_DIR)
-	del puresize-adjust.h
 	del config.h
 	del paths.h
 	del Emacs.ad.h
@@ -1046,12 +982,108 @@ distclean:
 	del *.orig
 	del *.rej
 	del *.exe
+	del *.obj
+	del *.pdb
+	del *.res
 	del $(CONFIG_VALUES)
 	cd $(LISP)
 	-del /s /q *.bak *.elc *.orig *.rej
 
 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
+	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 $(LIB_SRC)\run.c
+
+Installation:
+	@type > 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_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 $(DEBUG_XEMACS)
+  Compiling in extra debug checks. XEmacs will be slow!
+!endif
+<<NOKEEP
+	@echo --------------------------------------------------------------------
+	@type Installation
+	@echo --------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.