--- mstools/samples/tls/makefile	2018/08/09 18:20:59	1.1
+++ mstools/samples/tls/makefile	2018/08/09 18:22:11	1.1.1.2
@@ -3,25 +3,23 @@
 
 !include <ntwin32.mak>
 
-condlllibs = $(LIB)\crtdll.lib $(LIB)\*.lib
-
-# This line allows NMAKE to work as well
-
 all: tlscall.exe tlsdll.dll
 
 # Update the object files if necessary
 
 tlscall.obj: tlscall.c
-    $(cc) $(cflags) $(cvars) tlscall.c
+    $(cc) $(cdebug) $(cflags) $(cvars) tlscall.c
 
 tlsdll.obj: tlsdll.c
-    $(cc) $(cflags) $(cvars) tlsdll.c
+    $(cc) $(cdebug) $(cflags) $(cvars) tlsdll.c
 
 # Update the import library
 
 tlsdll.lib: tlsdll.obj tlsdll.def
+    $(cvtobj) $(cvtdebug) tlsdll.obj
     coff -lib -machine:$(CPU) \
     -def:tlsdll.def	    \
+    tlsdll.obj              \
     -out:tlsdll.lib
 
 
@@ -29,11 +27,11 @@ tlsdll.lib: tlsdll.obj tlsdll.def
 
 tlsdll.dll: tlsdll.obj tlsdll.def
     $(cvtobj) $(cvtdebug) *.obj
-    $(link) $(lflags) \
+    $(link) $(linkdebug) $(lflags) \
     -base:0x1C000000  \
-    -entry:LibMain    \
+    -entry:LibMain$(DLLENTRY)    \
     -out:tlsdll.dll   \
-    tlsdll.exp tlsdll.obj $(condlllibs)
+    tlsdll.exp tlsdll.obj $(conlibsdll)
 
 
 # Update the executable file if necessary.
@@ -41,4 +39,4 @@ tlsdll.dll: tlsdll.obj tlsdll.def
 
 tlscall.exe: tlscall.obj tlsdll.lib tlscall.def
     $(cvtobj) $(cvtdebug) *.obj
-    $(link) $(conflags) -out:tlscall.exe tlscall.obj tlsdll.lib $(conlibs)
+    $(link) $(linkdebug) $(conflags) -out:tlscall.exe tlscall.obj tlsdll.lib $(conlibsmt)