--- q_a/samples/readwrit/makefile	2018/08/09 18:29:19	1.1.1.1
+++ q_a/samples/readwrit/makefile	2018/08/09 18:29:31	1.1.1.2
@@ -2,41 +2,40 @@
 
 !include <ntwin32.mak>
 
-# This line allows NMAKE to work as well
-
 all: ReadWrit.exe DataBase.dll
 
 # Update the object files if necessary
 
 ReadWrit.obj: ReadWrit.c
-    $(cc) $(cflags) $(cvars) ReadWrit.c
+    $(cc) $(cdebug) $(cflags) $(cvars) ReadWrit.c
 
 
 DataBase.obj: DataBase.c
-    $(cc) $(cflags) $(cvars) DataBase.c
+    $(cc) $(cdebug) $(cflags) $(cvars) DataBase.c
 
 # Update the import library
 
 DataBase.lib: DataBase.obj DataBase.def
-    lib -machine:$(CPU)     \
-    -def:DataBase.def	    \
+    $(cvtobj) $(cvtdebug) database.obj
+    coff -lib -machine:$(CPU)     \
+    -def:DataBase.def DataBase.obj \
     -out:DataBase.lib
 
 # Update the dynamic link library
 
 DataBase.dll: DataBase.obj DataBase.def
-    $(link)           \
+    $(link) $(linkdebug)           \
     -base:0x1C000000  \
     -dll	      \
-    -entry:DLLInitExitPoint\
+#    -entry:DLLInitExitPoint@12\
+    -entry:DLLInitExitPoint$(DLLENTRY)\
     -out:DataBase.dll   \
-    DataBase.exp DataBase.obj \
-# HACK
-    crtdll.lib ntdll.lib kernel32.lib
+    DataBase.exp DataBase.obj $(conlibsdll)
 
 
 # Update the executable file if necessary.
 # If so, add the resource back in.
 
 ReadWrit.exe: ReadWrit.obj DataBase.lib
-    $(link) $(conflags) -out:ReadWrit.exe ReadWrit.obj  DataBase.lib  $(conlibs)
+    $(cvtobj) $(cvtdebug) ReadWrit.obj
+    $(link) $(linkdebug) $(conflags) -out:ReadWrit.exe ReadWrit.obj  DataBase.lib  $(conlibs)