--- mstools/samples/rpc/mandel/makefile	2018/08/09 18:21:59	1.1.1.3
+++ mstools/samples/rpc/mandel/makefile	2018/08/09 18:24:14	1.1.1.4
@@ -1,7 +1,7 @@
 #*************************************************************#
 #**                                                         **#
 #**                 Microsoft RPC Examples                  **#
-#**		  Mandelbrot RPC Application		    **#
+#**               Mandelbrot RPC Application                **#
 #**            Copyright(c) Microsoft Corp. 1991            **#
 #**                                                         **#
 #*************************************************************#
@@ -24,24 +24,8 @@ RPCFLAG =
 RPCFLAG = -DRPC
 !endif
 
-# Establish the inference rules.
-# Use lower warning levels for the RPC version on MIPS;
-# remove -std switch from compiler switches
-# Use different command line input for object conversion.
-
-cvtomf =
-!if "$(CPU)" == "MIPS"
-cvtomf = mip2coff $@
-!endif
-
-!if "$(CPU)" == "i386"
-# workaround for Windows NT 10/92 beta
-cflags = $(cflags:G3=Gz)
-!endif
-
 .c.obj:
-   $(cc) $(cflags) $(cvars) $(RPCFLAG) $<
-   $(cvtomf)
+   $(cc) $(cdebug) $(cflags) $(cvars) $(RPCFLAG) $<
 
 # Targets
 # The RPC version produces client and server executables.
@@ -54,19 +38,18 @@ all: mandel.exe
 !endif
 
 mandel.exe: mandel.obj remote.obj mandel.def mandel.rbj calc.obj
-    $(link) $(guiflags) -out:mandel.exe -map:mandel.map \
+    $(link) $(linkdebug) $(guiflags) -out:mandel.exe -map:mandel.map \
       mandel.obj remote.obj calc.obj mandel.rbj $(guilibs)
 
-client.exe: mandel.obj remote.obj mandel.def mandel.rbj \
-            mdlrpc_c.obj mdlrpc_x.obj
-    $(link) $(guiflags) -out:client.exe -map:client.map \
+client.exe: mandel.obj remote.obj mandel.def mandel.rbj mdlrpc_c.obj mdlrpc_x.obj
+    $(link) $(linkdebug) $(guiflags) -out:client.exe -map:client.map \
       mandel.obj remote.obj mdlrpc_c.obj mdlrpc_x.obj \
-      mandel.rbj rpcrt4.lib rpcndr.lib $(guilibs)
+      mandel.rbj rpcrt4.lib $(guilibs)
 
 server.exe: server.obj calc.obj mdlrpc_s.obj mdlrpc_y.obj
-    $(link) $(conflags) -out:server.exe -map:server.map \
+    $(link) $(linkdebug) $(conflags) -out:server.exe -map:server.map \
       server.obj calc.obj mdlrpc_s.obj mdlrpc_y.obj \
-      rpcrt4.lib rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # Update the resource if necessary
 mandel.rbj: mandel.rc mandel.h
@@ -86,40 +69,24 @@ calc.obj  : calc.c mandel.h mdlrpc.h
 !else
 mandel.obj: mandel.c mandel.h
 remote.obj: remote.c mandel.h
-calc.obj:     calc.c mandel.h
+calc.obj  : calc.c mandel.h
 !endif
 
 # client stub
 mdlrpc_c.obj : mdlrpc_c.c mdlrpc.h
-# use lower warning levels for the stub source code; add -W1
-!if "$(CPU)"=="i386"
-    $(cc) $(cflags) $(cvars) -W1 mdlrpc_c.c
-!endif
 
 # client auxiliary file
 mdlrpc_x.obj : mdlrpc_x.c mdlrpc.h
-# use lower warning levels for the stub source code; add -W1
-!if "$(CPU)"=="i386"
-    $(cc) $(cflags) $(cvars) -W1 mdlrpc_x.c
-!endif
 
 # server stub file
 mdlrpc_s.obj : mdlrpc_s.c mdlrpc.h
-# use lower warning levels for the stub source code; add -W1
-!if "$(CPU)"=="i386"
-    $(cc) $(cflags) -W1 $(cvars) mdlrpc_s.c
-!endif
 
 # server auxiliary file
 mdlrpc_y.obj : mdlrpc_y.c mdlrpc.h
-# use lower warning levels for the stub source code; add -W1
-!if "$(CPU)"=="i386"
-    $(cc) $(cflags) $(cvars) -W1 mdlrpc_y.c
-!endif
 
 # Stubs, auxiliary and header file from the IDL file
 mdlrpc.h mdlrpc_c.c mdlrpc_x.c mdlrpc_s.c mdlrpc_y.c: mdlrpc.idl mdlrpc.acf
-    midl mdlrpc.idl
+    midl -cpp_cmd $(cc) -cpp_opt "-E" mdlrpc.idl
 
 clean:
     -del client.exe
@@ -127,12 +94,9 @@ clean:
     -del mandel.exe
 
 cleanall:  clean
-    -del *.o
-    -del *.oo
+    -del *.obj
+    -del *.map
     -del *.res
     -del *.rbj
-    -del *.map
-    -del *.obj
-    -del mdlrpc.h
-    -del mdlrpc_*.obj
     -del mdlrpc_*.c
+    -del mdlrpc.h