--- a/nt/xpm.mak	Mon Aug 13 11:32:27 2007 +0200
+++ b/nt/xpm.mak	Mon Aug 13 11:33:38 2007 +0200
@@ -1,21 +1,44 @@
 #
 # 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(DEBUG_XEMACS)
-DEBUG_XEMACS=0
+!if !defined(USE_CRTDLL)
+USE_CRTDLL=0
 !endif
 
-!if $(DEBUG_XEMACS)
+!if $(DEBUG)
 OPT=-Od -Zi
+LINK_DEBUG=-debug
 !else
-OPT=-O2 -G5 -Zi
+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
 !endif
 
 WARN_CPP_FLAGS = -W3
 
 CC=cl
-CFLAGS=-nologo -DFOR_MSW $(WARN_CPP_FLAGS) $(OPT) $(INCLUDES) -Fo$@ -c
+CFLAGS=-nologo -DFOR_MSW $(C_LIBFLAG) $(WARN_CPP_FLAGS) \
+	$(OPT) $(INCLUDES) -c
 
 OBJS= data.obj create.obj misc.obj rgb.obj scan.obj parse.obj hashtab.obj \
       WrFFrI.obj RdFToI.obj CrIFrDat.obj CrDatFrI.obj \
@@ -29,8 +52,8 @@
 .SUFFIXES:
 .SUFFIXES:	.c
 
-.c.obj:
-	$(CC) $(CFLAGS) $< -Fo$@
+.c.obj::
+	$(CC) $(CFLAGS) $<
 
 
 # targets
@@ -44,4 +67,9 @@
 	mkdir ..\X11
 
 Xpm.lib: $(OBJS)
-	link.exe -lib -nologo -out:$@ $(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