--- a/nt/xpm.mak	Mon Aug 13 11:19:22 2007 +0200
+++ b/nt/xpm.mak	Mon Aug 13 11:20:41 2007 +0200
@@ -1,44 +1,21 @@
 #
 # XPM Makefile for Microsoft NMAKE without X libraries
 #
-!if !defined(DEBUG)
-!if defined(DEBUG_XEMACS)
-DEBUG=$(DEBUG_XEMACS)
-!else
-DEBUG=0
-!endif
-!endif
 
-!if !defined(USE_CRTDLL)
-USE_CRTDLL=0
+!if !defined(DEBUG_XEMACS)
+DEBUG_XEMACS=0
 !endif
 
-!if $(DEBUG)
+!if $(DEBUG_XEMACS)
 OPT=-Od -Zi
-LINK_DEBUG=-debug
 !else
-OPT=-Ox
-!endif
-
-!if $(USE_CRTDLL)
-!if $(DEBUG)
-C_LIBFLAG=-MDd
-!else
-C_LIBFLAG=-MD
-!endif
-!else
-!if $(DEBUG)
-C_LIBFLAG=-MLd
-!else
-C_LIBFLAG=-ML
-!endif
+OPT=-O2 -G5 -Zi
 !endif
 
 WARN_CPP_FLAGS = -W3
 
 CC=cl
-CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \
-	$(OPT) $(INCLUDES) -c
+CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) $(INCLUDES) -Fo$@ -c
 
 OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \
       WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \
@@ -52,8 +29,8 @@
 .SUFFIXES:
 .SUFFIXES:	.c
 
-.c.obj::
-	$(CC) $(CFLAGS) $<
+.c.obj:
+	$(CC) $(CFLAGS) $< -Fo$@
 
 
 # targets
@@ -67,9 +44,4 @@
 	mkdir ..\X11
 
 Xpm.lib: $(OBJS)
-!if $(USE_CRTDLL)
-# Target is ok, link builds lib as a side effect.
-	link -nologo -dll -def:xpm.def -out:Xpm.dll gdi32.lib $(OBJS) 
-!else
-	lib -nologo -out:$@ $(OBJS)
-!endif
+	link.exe -lib -nologo -out:$@ $(OBJS)