--- mstools/samples/ole/srvrdemo/makefile	2018/08/09 18:20:49	1.1
+++ mstools/samples/ole/srvrdemo/makefile	2018/08/09 18:21:49	1.1.1.2
@@ -2,36 +2,37 @@
 
 !include <ntwin32.mak>
 
-# This line allows NMAKE to work as well
+my_lib = advapi32.lib olesvr32.lib
 
 all: srvrdemo.exe
 
 # Update the resource if necessary
 
 srvrdemo.res: srvrdemo.rc
-    rc -r -fo res.tmp srvrdemo.rc
-    cvtres -$(CPU) res.tmp -o srvrdemo.res
-    del res.tmp
+    rc -r srvrdemo.rc
+
+srvrdemo.rbj: srvrdemo.res
+    cvtres -$(CPU) srvrdemo.res -o srvrdemo.rbj
 
 # Update the object file if necessary
 
 srvrdemo.obj:  srvrdemo.c
-    $(cc) $(cflags) $(cvars) srvrdemo.c
+    $(cc) $(cflags) $(cvars) $(cdebug) srvrdemo.c
 
 doc.obj:   doc.c
-    $(cc) $(cflags) $(cvars) doc.c
+    $(cc) $(cflags) $(cvars) $(cdebug) doc.c
 
 obj.obj:   obj.c
-    $(cc) $(cflags) $(cvars) obj.c
+    $(cc) $(cflags) $(cvars) $(cdebug) obj.c
 
 file.obj:   file.c
-    $(cc) $(cflags) $(cvars) file.c
+    $(cc) $(cflags) $(cvars) $(cdebug) file.c
 
 server.obj: server.c
-    $(cc) $(cflags) $(cvars) server.c
+    $(cc) $(cflags) $(cvars) $(cdebug) server.c
 
 # Update the executable file if necessary, and if so, add the resource back in.
 
-srvrdemo.exe: srvrdemo.obj doc.obj obj.obj server.obj file.obj srvrdemo.res srvrdemo.def
+srvrdemo.exe: srvrdemo.obj doc.obj obj.obj server.obj file.obj srvrdemo.rbj srvrdemo.def
     $(cvtobj) $(cvtdebug) *.obj
-    $(link) $(guiflags) -out:srvrdemo.exe srvrdemo.obj file.obj doc.obj obj.obj server.obj srvrdemo.res $(guilibs)
+    $(link) $(linkdebug) $(guiflags) -out:srvrdemo.exe srvrdemo.obj file.obj doc.obj obj.obj server.obj srvrdemo.rbj $(guilibs) $(my_lib)