--- mstools/samples/rpc/data/xmit/makefile	2018/08/09 18:22:09	1.1.1.2
+++ mstools/samples/rpc/data/xmit/makefile	2018/08/09 18:24:25	1.1.1.3
@@ -1,81 +1,56 @@
 #*************************************************************#
 #**                                                         **#
 #**                 Microsoft RPC Examples                  **#
-#**		      xmit Application			    **#
-#**	       Copyright(c) Microsoft Corp. 1992	    **#
+#**                   xmit Application                      **#
+#**            Copyright(c) Microsoft Corp. 1992            **#
 #**                                                         **#
 #*************************************************************#
 
 !include <ntwin32.mak>
 
-!if "$(CPU)" == "i386"
-WARN = -W0
-cvtomf =
-# workaround for Windows NT 10/92 beta
-cflags = $(cflags:G3=Gz)
-!endif
-!if "$(CPU)" == "MIPS"
-WARN =
-cvtomf = mip2coff $@
-!endif
-
 .c.obj:
-   $(cc) $(cflags) $(cvars) $<
-   $(cvtomf)
-
-.obj.exe:
-    $(link) $(conflags) -out:$(@R).exe $(@R).obj $(conlibs)
+   $(cc) $(cdebug) $(cflags) $(cvars) $<
 
 all : xmitc xmits
 
 # Make the client
 xmitc : xmitc.exe
 xmitc.exe : xmitc.obj xmitu.obj xmit_c.obj xmit_x.obj
-    $(link) $(conflags) -out:xmitc.exe -map:xmitc.map \
-      xmitc.obj xmitu.obj xmit_c.obj xmit_x.obj	\
-      rpcrt4.lib rpcndr.lib $(conlibs)
+    $(link) $(linkdebug) $(conflags) -out:xmitc.exe -map:xmitc.map \
+      xmitc.obj xmitu.obj xmit_c.obj xmit_x.obj \
+      rpcrt4.lib $(conlibs)
 
 # xmit client main program
 xmitc.obj : xmitc.c xmit.h xmitu.h
 
 # xmit client stub
 xmit_c.obj : xmit_c.c xmit.h
-   $(cc) $(cflags) $(cvars) $(WARN) xmit_c.c
-   $(cvtomf)
 
 # xmit client auxiliary file
 xmit_x.obj : xmit_x.c xmit.h
-   $(cc) $(cflags) $(cvars) $(WARN) xmit_x.c
-   $(cvtomf)
 
 # Make the server executable
 xmits : xmits.exe
 xmits.exe : xmits.obj xmitu.obj xmitp.obj xmit_s.obj xmit_y.obj
-    $(link) $(conflags) -out:xmits.exe -map:xmits.map \
+    $(link) $(linkdebug) $(conflags) -out:xmits.exe -map:xmits.map \
       xmits.obj xmitu.obj xmit_s.obj xmitp.obj xmit_y.obj \
-      rpcrt4.lib rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # xmit server main
 xmits.obj : xmits.c xmit.h xmitu.h
 
 # remote procedures
-xmitp.obj  : xmitp.c xmit.h
-   $(cc) $(cflags) $(cvars) $(WARN) xmitp.c
-   $(cvtomf)
+xmitp.obj : xmitp.c xmit.h
 
 # xmit server stub file
 xmit_s.obj : xmit_s.c xmit.h
-   $(cc) $(cflags) $(cvars) $(WARN) xmit_s.c
-   $(cvtomf)
 
 # xmit server auxiliary file
 xmit_y.obj : xmit_y.c xmit.h
-   $(cc) $(cflags) $(cvars) $(WARN) xmit_y.c
-   $(cvtomf)
 
 # Stubs, auxiliary and header file from the IDL file
 xmit.h xmit_c.c xmit_x.c xmit_s.c xmit_y.c : xmit.idl xmit.acf
-    midl xmit.idl
+    midl -cpp_cmd $(cc) -cpp_opt "-E" xmit.idl
 
 # Clean up everything
 cleanall : clean