--- mstools/samples/rpc/dict/makefile	2018/08/09 18:20:01	1.1.1.1
+++ mstools/samples/rpc/dict/makefile	2018/08/09 18:24:20	1.1.1.4
@@ -6,107 +6,84 @@
 #**            Copyright(c) Microsoft Corp. 1991            **#
 #**                                                         **#
 #*************************************************************#
-# Nmake macros for building Windows 32-Bit apps
 
 !include <ntwin32.mak>
 
 !if "$(CPU)" == "i386"
-COMPILECOMMAND = $(cc) $(cflags) $(cvars)
-W1COMPILECOMMAND = $(cc) $(cflags) $(cvars) -W1
-CONVERTOBJECTCMD = $(cvtobj) $@
-.c.obj:
-   $(COMPILECOMMAND) $<
-   $(CONVERTOBJECTCMD)
+cflags = $(cflags:G3=Gz)
 !endif
 
-!if "$(CPU)" == "MIPS"
-COMPILECOMMAND = $(cc) $(cflags) $(cvars)
-w1cflags = -c -G0 -O -EL -DMIPS=1 -I\nt\mstools\h
-W1COMPILECOMMAND = $(cc) $(w1cflags) $(cvars)
-CONVERTOBJECTCMD = $(cvtobj)
 .c.obj:
-   $(W1COMPILECOMMAND) $<
-   $(CONVERTOBJECTCMD)
-!endif
+   $(cc) $(cdebug) $(cflags) $(cvars) $<
 
 all : client.exe server.exe play.exe
 
+# Make the client
+client : client.exe
 client.exe : client.obj util0.obj replay_c.obj replay_x.obj
-    $(link) $(conflags) -out:client.exe \
-            client.obj util0.obj replay_c.obj replay_x.obj \
-            $(conlibs) $(LIB)\winrpc.lib $(LIB)\ndrlib.lib
-
-server.exe : server.obj util0.obj replay_s.obj replay_y.obj \
-             replay.obj dict0.obj
-    $(link) $(conflags) -out:server.exe \
-            server.obj util0.obj replay_s.obj replay_y.obj \
-            replay.obj dict0.obj \
-            $(conlibs) $(LIB)\winrpc.lib $(LIB)\ndrlib.lib
-
-play.exe : play.obj lutil0.obj dict0.obj
-    $(link) $(conflags) -out:play.exe \
-            play.obj lutil0.obj dict0.obj replay_c.obj replay_x.obj \
-            $(conlibs) $(LIB)\winrpc.lib $(LIB)\ndrlib.lib
+    $(link) $(linkdebug) $(conflags) -out:client.exe -map:client.map \
+      client.obj util0.obj replay_c.obj replay_x.obj \
+      rpcrt4.lib $(conlibs)
 
+# dict client main program
 client.obj : client.c util0.h replay.h
 
-server.obj : server.c util0.h replay.h
+# dict client stub
+replay_x.obj : replay_x.c replay.h
 
-replay.obj : util0.h replay.h replay.c
+# dict client auxiliary file
+replay_c.obj : replay_c.c replay.h
 
-util0.obj : util0.h util0.c replay.h
+# Make the server executable
+server : server.exe
+server.exe : server.obj util0.obj replay_s.obj replay_y.obj replay.obj dict0.obj
+    $(link) $(linkdebug) $(conflags) -out:server.exe -map:server.map \
+      server.obj util0.obj replay_s.obj replay_y.obj replay.obj dict0.obj \
+      rpcrt4.lib $(conlibs)
 
-# use common source code for both RPC and standalone version
-# the standalone version is compiled using the _LOCAL flag
-# use different command line input for different operating systems
-#
-!if "$(CPU)" == "i386"
-lutil0.obj : util0.h util0.c
-    $(cc) $(cflags) -Folutil0.obj -D_LOCAL util0.c
-    $(cvtobj) lutil0.obj
-!endif
+# dict server main program
+server.obj : server.c util0.h replay.h
 
-!if "$(CPU)" == "MIPS"
-lutil0.obj : util0.h util0.c replay.h
-    cp util0.obj saved
-    $(cc) $(cflags) $(cvars) -D_LOCAL util0.c
-    mip2coff util0.o & del util0.o & rename util0.oo lutil0.obj
-    cp saved util0.obj & del saved
+# dict remote procedures
+replay.obj : replay.c util0.h replay.h
 
-dict0.obj : dict0.h dict0.c
-!endif
+# dict server stub
+replay_y.obj : replay_y.c replay.h
 
-play.obj : play.c util0.h dict0.h
+# dict server auxiliary file
+replay_s.obj : replay_s.c replay.h
 
-# compile the stubs at a lower warning level
-replay_c.obj : replay_c.c replay.h
-   $(W1COMPILECOMMAND) replay_c.c
-   $(CONVERTOBJECTCMD)
+# make the local executable
+play : play.exe
+play.exe : play.obj lutil0.obj dict0.obj
+    $(link) $(linkdebug) $(conflags) -out:play.exe -map:play.map \
+      play.obj lutil0.obj dict0.obj \
+      $(conlibs)
 
-replay_s.obj : replay_s.c replay.h
-   $(W1COMPILECOMMAND) replay_s.c
-   $(CONVERTOBJECTCMD)
+# dict local main program
+play.obj : play.c util0.h dict0.h
 
-replay_x.obj : replay_x.c replay.h
-   $(W1COMPILECOMMAND) replay_x.c
-   $(CONVERTOBJECTCMD)
+dict0.obj : dict0.c dict0.h
 
-replay_y.obj : replay_y.c replay.h
-   $(W1COMPILECOMMAND) replay_y.c
-   $(CONVERTOBJECTCMD)
+util0.obj : util0.c util0.h
+
+lutil0.obj : util0.c util0.h
+   copy util0.c lutil0.c
+   $(cc) $(cdebug) $(cflags) $(cvars) -D_LOCAL lutil0.c
+   del lutil0.c
 
+# Stubs, auxiliary and header file from the IDL file
 replay.h replay_s.c replay_c.c replay_y.c replay_x.c : replay.idl replay.acf
     midl -cpp_cmd $(cc) -cpp_opt "-E" replay.idl
 
-play : play.exe
-
-clean :
+# Clean up everything
+cleanall : clean
     -del *.exe
 
-
-cleanall : clean
-    -del *.o
-    -del *.oo
-    -del replay.h
-    -del replay_?.*
+# Clean up everything but the .EXEs
+clean :
     -del *.obj
+    -del *.map
+    -del replay_?.c
+    -del replay.h
+