Mercurial > hg > xemacs-beta

diff w32/xemacs.mak @ 211:78478c60bfcd r20-4b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b4
author cvs
date Mon, 13 Aug 2007 10:05:51 +0200
parents 41ff10fd062f
children
line wrap: on
line diff
--- a/w32/xemacs.mak	Mon Aug 13 10:05:01 2007 +0200
+++ b/w32/xemacs.mak	Mon Aug 13 10:05:51 2007 +0200
@@ -1,19 +1,45 @@
+MSDEV=c:\msdev
 XEMACS=..
 LISP=$(XEMACS)\lisp
-CC=cl
+
+HAVE_X=0
+HAVE_W32=1
+
+HAVE_MULE=0
 
 OPT=-Od -Zi
 #OPT=-O2 -G5 -Zi
 
-include ..\version.sh
+#------------------------------------------------------------------------------
+
+!if $(HAVE_X)
+MAGICK=e:\utils\ImageMagick
+X11R6=e:\utils\X11R6
+
+X_DEFINES=-DHAVE_X_WINDOWS
+X_INCLUDES=-I$(X11R6)\include -I$(MAGICK)\Magick
+X_LIBS=Magick.dll.lib Xaw.lib Xmu.lib Xt.lib SM.lib ICE.lib Xext.lib X11.lib
+!endif
+
+!if $(HAVE_W32)
+W32_DEFINES=-DHAVE_W32GUI
+!endif
+
+!if $(HAVE_MULE)
+MULE_DEFINES=-DMULE
+!endif
+
+!include "..\version.sh"
 
 #------------------------------------------------------------------------------
 
 # Generic variables
 
-INCLUDES=-I$(X11R6)\include -I.\inc -I$(XEMACS)\src\
- -I$(XEMACS)\lwlib -I"$(MSVCDIR)\include"
-LIBRARIES=
+INCLUDES=$(X_INCLUDES) -I$(XEMACS)\nt\inc -I$(XEMACS)\src -I$(XEMACS)\lwlib 
+DEFINES=$(X_DEFINES) $(W32_DEFINES) $(MULE_DEFINES) -DWIN32 -D_WIN32 \
+	-D_M_IX86 -D_X86_ \
+	-DWIN32_LEAN_AND_MEAN -DWINDOWSNT -Demacs -DHAVE_CONFIG_H \
+	-D_MSC_VER=999 -D_DEBUG -DDEBUG_XEMACS
 
 OUTDIR=obj
 
@@ -30,7 +56,7 @@
  $(XEMACS)\src\paths.h
 
 $(XEMACS_INCLUDES):
-	!"copy *.h $(XEMACS)\src"
+	!copy *.h $(XEMACS)\src
 
 #------------------------------------------------------------------------------
 
@@ -50,15 +76,16 @@
 
 #------------------------------------------------------------------------------
 
+!if $(HAVE_X)
+
 # LWLIB Library
 
 LWLIB=$(OUTDIR)\lwlib.lib
 LWLIB_SRC=$(XEMACS)\lwlib
-LWLIB_FLAGS=-nologo -w $(OPT) $(INCLUDES) -D "WIN32" -D "_DEBUG" \
- -D "_NTSDK" -D "_M_IX86" -D "_X86_" \
- -D "NEED_ATHENA" -D "NEED_LUCID" \
- -D "_WINDOWS" -D "MENUBARS_LUCID" -D "SCROLLBARS_LUCID" -D "DIALOGS_ATHENA" \
- -D "WINDOWSNT" -Fo$@ -c
+LWLIB_FLAGS=-nologo -w $(OPT) $(INCLUDES) $(DEFINES) \
+ -DNEED_ATHENA -DNEED_LUCID \
+ -D_WINDOWS -DMENUBARS_LUCID -DSCROLLBARS_LUCID -DDIALOGS_ATHENA \
+ -Fo$@ -c
 LWLIB_OBJS= \
         $(OUTDIR)\lwlib-config.obj \
         $(OUTDIR)\lwlib-utils.obj \
@@ -69,7 +96,7 @@
         $(OUTDIR)\xlwscrollbar.obj
 
 $(LWLIB): $(XEMACS_INCLUDES) $(LWLIB_OBJS)
-	link.exe -lib -nologo -debug -debugtype:both -out:$@ $(LWLIB_OBJS)
+	link.exe -lib -nologo -debugtype:both -out:$@ $(LWLIB_OBJS)
 
 $(OUTDIR)\lwlib-config.obj:	$(LWLIB_SRC)\lwlib-config.c
 	 $(CC) $(LWLIB_FLAGS) $**
@@ -92,22 +119,22 @@
 $(OUTDIR)\xlwscrollbar.obj:	$(LWLIB_SRC)\xlwscrollbar.c
 	 $(CC) $(LWLIB_FLAGS) $**
 
+!endif
 #------------------------------------------------------------------------------
 
 # lib-src programs
 
 LIB_SRC=$(XEMACS)\lib-src
-LIB_SRC_FLAGS=$(INCLUDES) -D_DEBUG -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN \
- -D_NTSDK -D_M_IX86 -ML -D_X86_ -Demacs -DHAVE_CONFIG_H -D_MSC_VER=999
+LIB_SRC_FLAGS=$(INCLUDES) $(DEFINES) -ML
 LIB_SRC_LIBS= kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib libc.lib
+ advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib \
+ odbccp32.lib libc.lib
 LIB_SRC_LFLAGS=-nologo $(LIB_SRC_LIBS) -base:0x1000000\
  -subsystem:console -pdb:none -debugtype:both -machine:I386\
  -nodefaultlib -out:$@ -debug:full
 
-
 DOC=$(LIB_SRC)\DOC
-DOC_SRCS=\
+DOC_SRC1=\
  $(XEMACS)\src\abbrev.c \
  $(XEMACS)\src\alloc.c \
  $(XEMACS)\src\alloca.c \
@@ -122,14 +149,12 @@
  $(XEMACS)\src\cmdloop.c \
  $(XEMACS)\src\cmds.c \
  $(XEMACS)\src\console-stream.c \
- $(XEMACS)\src\console-w32.c \
  $(XEMACS)\src\console.c \
  $(XEMACS)\src\data.c \
  $(XEMACS)\src\debug.c \
- $(XEMACS)\src\device-w32.c
+ $(XEMACS)\src\device.c \
+ $(XEMACS)\src\dgif_lib.c 
 DOC_SRC2=\
- $(XEMACS)\src\device.c \
- $(XEMACS)\src\dgif_lib.c \
  $(XEMACS)\src\dialog.c \
  $(XEMACS)\src\dired.c \
  $(XEMACS)\src\doc.c \
@@ -141,8 +166,6 @@
  $(XEMACS)\src\eval.c \
  $(XEMACS)\src\event-stream.c \
  $(XEMACS)\src\event-unixoid.c \
- $(XEMACS)\src\event-w32.c
-DOC_SRC3=\
  $(XEMACS)\src\events.c \
  $(XEMACS)\src\extents.c \
  $(XEMACS)\src\faces.c \
@@ -150,9 +173,9 @@
  $(XEMACS)\src\filelock.c \
  $(XEMACS)\src\filemode.c \
  $(XEMACS)\src\floatfns.c \
- $(XEMACS)\src\fns.c \
+ $(XEMACS)\src\fns.c 
+DOC_SRC3=\
  $(XEMACS)\src\font-lock.c \
- $(XEMACS)\src\frame-w32.c \
  $(XEMACS)\src\frame.c \
  $(XEMACS)\src\free-hook.c \
  $(XEMACS)\src\general.c \
@@ -160,8 +183,7 @@
  $(XEMACS)\src\gifalloc.c \
  $(XEMACS)\src\glyphs.c \
  $(XEMACS)\src\gmalloc.c \
- $(XEMACS)\src\gui.c
-DOC_SRC4=\
+ $(XEMACS)\src\gui.c  \
  $(XEMACS)\src\hash.c \
  $(XEMACS)\src\indent.c \
  $(XEMACS)\src\inline.c \
@@ -171,41 +193,85 @@
  $(XEMACS)\src\lread.c \
  $(XEMACS)\src\lstream.c \
  $(XEMACS)\src\macros.c \
- $(XEMACS)\src\marker.c \
+ $(XEMACS)\src\marker.c
+DOC_SRC4=\
  $(XEMACS)\src\md5.c \
  $(XEMACS)\src\minibuf.c \
  $(XEMACS)\src\nt.c \
  $(XEMACS)\src\ntheap.c \
  $(XEMACS)\src\ntproc.c \
  $(XEMACS)\src\objects.c \
- $(XEMACS)\src\objects-w32.c \
- $(XEMACS)\src\opaque.c
-DOC_SRC5=\
+ $(XEMACS)\src\opaque.c \
  $(XEMACS)\src\print.c \
  $(XEMACS)\src\process.c \
  $(XEMACS)\src\pure.c \
  $(XEMACS)\src\rangetab.c \
  $(XEMACS)\src\realpath.c \
  $(XEMACS)\src\redisplay-output.c \
- $(XEMACS)\src\redisplay-w32.c \
  $(XEMACS)\src\redisplay.c \
  $(XEMACS)\src\regex.c \
+ $(XEMACS)\src\scrollbar.c \
  $(XEMACS)\src\search.c \
  $(XEMACS)\src\signal.c \
- $(XEMACS)\src\sound.c \
+ $(XEMACS)\src\sound.c 
+DOC_SRC5=\
  $(XEMACS)\src\specifier.c \
  $(XEMACS)\src\strftime.c \
  $(XEMACS)\src\symbols.c \
  $(XEMACS)\src\syntax.c \
- $(XEMACS)\src\sysdep.c
-DOC_SRC6=\
+ $(XEMACS)\src\sysdep.c \
+ $(XEMACS)\src\termcap.c  \
  $(XEMACS)\src\tparam.c \
  $(XEMACS)\src\undo.c \
  $(XEMACS)\src\unexnt.c \
  $(XEMACS)\src\vm-limit.c \
- $(XEMACS)\src\w32-proc.c \
- $(XEMACS)\src\widget.c \
- $(XEMACS)\src\window.c 
+ $(XEMACS)\src\window.c \
+ $(XEMACS)\src\xgccache.c \
+ $(XEMACS)\src\xmu.c \
+ $(XEMACS)\src\widget.c
+
+!if $(HAVE_X)
+DOC_SRC6=\
+ $(XEMACS)\src\balloon_help.c \
+ $(XEMACS)\src\console-x.c \
+ $(XEMACS)\src\device-x.c  \
+ $(XEMACS)\src\dialog-x.c \
+ $(XEMACS)\src\EmacsFrame.c \
+ $(XEMACS)\src\EmacsManager.c \
+ $(XEMACS)\src\EmacsShell-sub.c\
+ $(XEMACS)\src\EmacsShell.c \
+ $(XEMACS)\src\event-Xt.c  \
+ $(XEMACS)\src\frame-x.c \
+ $(XEMACS)\src\glyphs-x.c \
+ $(XEMACS)\src\gui-x.c \
+ $(XEMACS)\src\menubar.c \
+ $(XEMACS)\src\menubar-x.c \
+ $(XEMACS)\src\objects-x.c \
+ $(XEMACS)\src\redisplay-x.c \
+ $(XEMACS)\src\scrollbar-x.c \
+ $(XEMACS)\src\balloon-x.c \
+ $(XEMACS)\src\xselect.c 
+!endif
+
+!if $(HAVE_W32)
+DOC_SRCS_7=\
+ $(XEMACS)\src\console-w32.c \
+ $(XEMACS)\src\device-w32.c  \
+ $(XEMACS)\src\event-w32.c  \
+ $(XEMACS)\src\frame-w32.c \
+ $(XEMACS)\src\objects-w32.c \
+ $(XEMACS)\src\redisplay-w32.c \
+ $(XEMACS)\src\w32-proc.c
+!endif
+
+!if $(HAVE_MULE)
+DOC_SRCS_8=\
+ $(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
+!endif
 
 MAKE_DOCFILE=$(LIB_SRC)\make-docfile.exe
 
@@ -221,12 +287,13 @@
 	link.exe -out:$@ -subsystem:windows -entry:WinMainCRTStartup \
 	-pdb:none -release -incremental:no $** \
 	kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib \
-	advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib libc.lib
+	advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib \
+	odbccp32.lib libc.lib
 
-$(OUTDIR)\runemacs.obj:	.\runemacs.c
+$(OUTDIR)\runemacs.obj:	$(XEMACS)\nt\runemacs.c
 	$(CC) -nologo -ML -w $(OPT) -c \
 	-D_DEBUG -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN \
-	-D_NTSDK -D_M_IX86 -D_X86_ -Demacs -DHAVE_CONFIG_H -D_MSC_VER=999 \
+	-D_M_IX86 -D_X86_ -Demacs -DHAVE_CONFIG_H -D_MSC_VER=999 \
 	$** -Fo$@
 
 SUPPORT_PROGS=$(MAKE_DOCFILE) $(RUNEMACS)
@@ -238,23 +305,72 @@
 TEMACS_DIR=$(XEMACS)\src
 TEMACS=$(TEMACS_DIR)\temacs.exe
 TEMACS_SRC=$(XEMACS)\src
-TEMACS_LIBS=$(LASTFILE) kernel32.lib user32.lib gdi32.lib \
+TEMACS_LIBS=$(LASTFILE) $(LWLIB) $(X_LIBS) kernel32.lib user32.lib gdi32.lib \
  winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
- uuid.lib wsock32.lib libc.lib
+ uuid.lib odbc32.lib odbccp32.lib wsock32.lib libc.lib
 TEMACS_LFLAGS=-nologo $(LIBRARIES) -base:0x1000000\
  -stack:0x800000 -entry:_start -subsystem:console\
  -pdb:$(TEMACS_DIR)\temacs.pdb -map:$(TEMACS_DIR)\temacs.map -debug:full\
- -heap:0x00100000 -out:$@
+ -heap:0x00100000 -out:$@\
 
-TEMACS_CPP_FLAGS= $(INCLUDES) -D_DEBUG -DWIN32 -D_WIN32 -DWIN32_LEAN_AND_MEAN \
- -D_NTSDK -D_M_IX86 -D_X86_ -Demacs -DHAVE_CONFIG_H -D_MSC_VER=999 \
+TEMACS_CPP_FLAGS= $(INCLUDES) $(DEFINES) \
  -DEMACS_MAJOR_VERSION=$(emacs_major_version) \
  -DEMACS_MINOR_VERSION=$(emacs_minor_version) \
  -DXEMACS_CODENAME=\"$(xemacs_codename)\" \
  -DPATH_PREFIX=\"$(XEMACS)\"
-TEMACS_FLAGS=-nologo -ML $(OPT) -c $(TEMACS_CPP_FLAGS)
+TEMACS_FLAGS=-nologo -ML -w $(OPT) -c $(TEMACS_CPP_FLAGS)
+
+!if $(HAVE_X)
+TEMACS_X_OBJS=\
+	$(OUTDIR)\balloon-x.obj \
+	$(OUTDIR)\balloon_help.obj \
+	$(OUTDIR)\console-x.obj \
+	$(OUTDIR)\device-x.obj \
+	$(OUTDIR)\dialog-x.obj \
+	$(OUTDIR)\EmacsFrame.obj \
+	$(OUTDIR)\EmacsManager.obj \
+	$(OUTDIR)\EmacsShell.obj \
+	$(OUTDIR)\TopLevelEmacsShell.obj\
+	$(OUTDIR)\TransientEmacsShell.obj\
+	$(OUTDIR)\event-Xt.obj \
+	$(OUTDIR)\frame-x.obj \
+	$(OUTDIR)\glyphs-x.obj \
+	$(OUTDIR)\gui-x.obj \
+	$(OUTDIR)\menubar.obj \
+	$(OUTDIR)\menubar-x.obj \
+	$(OUTDIR)\objects-x.obj \
+	$(OUTDIR)\redisplay-x.obj \
+	$(OUTDIR)\scrollbar.obj \
+	$(OUTDIR)\scrollbar-x.obj \
+	$(OUTDIR)\xgccache.obj \
+	$(OUTDIR)\xmu.obj \
+	$(OUTDIR)\xselect.obj
+!endif
+
+!if $(HAVE_W32)
+TEMACS_W32_OBJS=\
+	$(OUTDIR)\console-w32.obj \
+	$(OUTDIR)\device-w32.obj \
+	$(OUTDIR)\event-w32.obj \
+	$(OUTDIR)\frame-w32.obj \
+	$(OUTDIR)\objects-w32.obj \
+	$(OUTDIR)\redisplay-w32.obj \
+	$(OUTDIR)\w32-proc.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 \
+!endif
 
 TEMACS_OBJS= \
+	$(TEMACS_X_OBJS)\
+	$(TEMACS_W32_OBJS)\
+	$(TEMACS_MULE_OBJS)\
 	$(OUTDIR)\abbrev.obj \
 	$(OUTDIR)\alloc.obj \
 	$(OUTDIR)\alloca.obj \
@@ -269,11 +385,9 @@
 	$(OUTDIR)\cmdloop.obj \
 	$(OUTDIR)\cmds.obj \
 	$(OUTDIR)\console-stream.obj \
-	$(OUTDIR)\console-w32.obj \
 	$(OUTDIR)\console.obj \
 	$(OUTDIR)\data.obj \
 	$(OUTDIR)\debug.obj \
-	$(OUTDIR)\device-w32.obj \
 	$(OUTDIR)\device.obj \
 	$(OUTDIR)\dgif_lib.obj \
 	$(OUTDIR)\dialog.obj \
@@ -287,7 +401,6 @@
 	$(OUTDIR)\eval.obj \
 	$(OUTDIR)\event-stream.obj \
 	$(OUTDIR)\event-unixoid.obj \
-	$(OUTDIR)\event-w32.obj \
 	$(OUTDIR)\events.obj \
 	$(OUTDIR)\extents.obj \
 	$(OUTDIR)\faces.obj \
@@ -297,7 +410,6 @@
 	$(OUTDIR)\floatfns.obj \
 	$(OUTDIR)\fns.obj \
 	$(OUTDIR)\font-lock.obj \
-	$(OUTDIR)\frame-w32.obj \
 	$(OUTDIR)\frame.obj \
 	$(OUTDIR)\free-hook.obj \
 	$(OUTDIR)\general.obj \
@@ -321,7 +433,6 @@
 	$(OUTDIR)\nt.obj \
 	$(OUTDIR)\ntheap.obj \
 	$(OUTDIR)\ntproc.obj \
-	$(OUTDIR)\objects-w32.obj \
 	$(OUTDIR)\objects.obj \
 	$(OUTDIR)\opaque.obj \
 	$(OUTDIR)\print.obj \
@@ -330,7 +441,6 @@
 	$(OUTDIR)\rangetab.obj \
 	$(OUTDIR)\realpath.obj \
 	$(OUTDIR)\redisplay-output.obj \
-	$(OUTDIR)\redisplay-w32.obj \
 	$(OUTDIR)\redisplay.obj \
 	$(OUTDIR)\regex.obj \
 	$(OUTDIR)\search.obj \
@@ -345,23 +455,18 @@
 	$(OUTDIR)\undo.obj \
 	$(OUTDIR)\unexnt.obj \
 	$(OUTDIR)\vm-limit.obj \
-	$(OUTDIR)\w32-proc.obj \
 	$(OUTDIR)\widget.obj \
 	$(OUTDIR)\window.obj 
 
-#------------------------------------------------------------------------------
-
 # Rules
 
 .SUFFIXES:
 .SUFFIXES:	.c
 
 # nmake rule
-{$(TEMACS_SRC)}.c{$(OUTDIR)}.obj:	
+{$(TEMACS_SRC)}.c{$(OUTDIR)}.obj:
 	$(CC) $(TEMACS_FLAGS) $< -Fo$@ -Fr$*.sbr
 
-# Specific builds
-
 $(OUTDIR)\TopLevelEmacsShell.obj:	$(TEMACS_SRC)\EmacsShell-sub.c
 	$(CC) $(TEMACS_FLAGS) -DDEFINE_TOP_LEVEL_EMACS_SHELL $** -Fo$@
 
@@ -374,78 +479,69 @@
 #$(TEMACS_SRC)\paths.h: $(TEMACS_SRC)\paths.h.in
 #	!"cd $(TEMACS_SRC); cp paths.h.in paths.h"
 
-$(TEMACS): $(TEMACS_INCLUDES) $(TEMACS_OBJS) $(LASTFILE)
-	link.exe $(TEMACS_LFLAGS) @<<
-$(TEMACS_OBJS) $(TEMACS_LIBS)
+$(TEMACS): $(TEMACS_INCLUDES) $(TEMACS_OBJS)
+	link.exe @<<
+  $(TEMACS_LFLAGS) $(TEMACS_OBJS) $(TEMACS_LIBS)
 <<
-	dir /b/s obj\*.sbr > bscmake.tmp
-	bscmake -o$*.bsc @bscmake.tmp
-
 
 #------------------------------------------------------------------------------
 
 # LISP bits 'n bobs
 
-$(DOC): $(MAKE_DOCFILE) $(DOC_SRCS) $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6)
-	cd $(TEMACS_DIR)
-	del $(DOC)
-	!$(TEMACS) -batch -l make-docfile.el -- -o $(DOC) -i $(XEMACS)\site-packages
-	!$(MAKE_DOCFILE) -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRCS)
-	!$(MAKE_DOCFILE) -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC1)
-	!$(MAKE_DOCFILE) -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC2)
-	!$(MAKE_DOCFILE) -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC3)
-	!$(MAKE_DOCFILE) -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC4)
-	!$(MAKE_DOCFILE) -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC4)
-	!$(MAKE_DOCFILE) -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC5)
-
 LOADPATH=$(LISP)\prim
 
-dump-elcs:	$(TEMACS)
-	cd $(TEMACS_DIR)
+$(DOC): $(LOADPATH)\startup.elc $(LIB_SRC)\make-docfile.exe
+	!$(TEMACS) -batch -l 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)
+	!$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC3)
+	!$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC4)
+	!$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC5)
+	!$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC6)
+	!$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC7)
+	!$(LIB_SRC)\make-docfile.exe -a $(DOC) -d $(TEMACS_SRC) $(DOC_SRC8)
+
+$(LOADPATH)\startup.elc: $(LOADPATH)\startup.el
 	!$(TEMACS) -batch -l update-elc.el
 
-dump-xemacs:	$(TEMACS) $(SUPPORT_PROGS) $(DOC)
+dump-xemacs:
 	cd $(TEMACS_DIR)
 	!$(TEMACS) -batch -l loadup.el dump
 
 #------------------------------------------------------------------------------
 
-all: $(LASTFILE) $(TEMACS) $(SUPPORT_PROGS)
+# use this rule to build the complete system
+all: $(LASTFILE) $(LWLIB) $(SUPPORT_PROGS) $(TEMACS) $(DOC) dump-xemacs
 
 # use this rule to install the system
 install:
 
 # The last line demands that you have a semi-decent shell
-distclean:	$(OUTDIR)\nul
-	del *.bak
-	del *.orig
-	del *.rej
-	del *.pdb
-	del *.tmp
-	cd $(OUTDIR)
-	del *.obj
-	del *.sbr
-	del *.lib
-	cd ..\$(TEMACS_DIR)
-	del config.h
-	del paths.h
-	del puresize-adjust.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 *.exe
-	cd $(LISP)
-	-del /s /q *.bak *.elc *.orig *.rej
+distclean:
+        del *.bak
+        del *.pdb
+        del *.tmp
+        cd $(OUTDIR)
+        del *.obj
+        del *.sbr
+        del *.lib
+        cd ..\$(TEMACS_DIR)
+        del config.h
+        del paths.h
+        del puresize-adjust.h
+        del *.bak
+        del *.exe
+        del *.map
+        del *.bsc
+        del *.pdb
+        cd $(LIB_SRC)
+        del DOC
+        del *.bak
+        del *.exe
+        cd $(LISP)
+        del /s /q *.elc
 
 depend:
-	mkdepend -f xemacs.mak -p$(OUTDIR)\ -o.obj -w9999 -- $(TEMACS_CPP_FLAGS) --  $(DOC_SRCS) $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(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) $(LASTFILE_SRC)\lastfile.c $(LIB_SRC)\make-docfile.c .\runemacs.c
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.