--- mstools/samples/rpc/handles/cxhndl/makefile	2018/08/09 18:20:56	1.1.1.1
+++ mstools/samples/rpc/handles/cxhndl/makefile	2018/08/09 18:24:17	1.1.1.3
@@ -1,74 +1,60 @@
 #*************************************************************#
 #**                                                         **#
 #**                 Microsoft RPC Examples                  **#
-#**		      cxhndl Application		    **#
-#**	       Copyright(c) Microsoft Corp. 1992	    **#
+#**                   cxhndl Application                    **#
+#**            Copyright(c) Microsoft Corp. 1992            **#
 #**                                                         **#
 #*************************************************************#
 
 !include <ntwin32.mak>
 
 !if "$(CPU)" == "i386"
-cvtomf =
-WARN = -W1
-!endif
-!if "$(CPU)" == "MIPS"
-cvtomf = mip2coff $@
-WARN =
+cflags = $(cflags:G3=Gz)
 !endif
 
 .c.obj:
-   $(cc) $(cflags) $(cvars) $<
-   $(cvtomf)
+   $(cc) $(cdebug) $(cflags) $(cvars) $<
 
 all : cxhndlc cxhndls
 
 # Make the cxhndl client
 cxhndlc : cxhndlc.exe
 cxhndlc.exe : cxhndlc.obj cxhndl_c.obj cxhndl_x.obj
-    $(link) $(conflags) -out:cxhndlc.exe \
+    $(link) $(linkdebug) $(conflags) -out:cxhndlc.exe \
       cxhndlc.obj cxhndl_c.obj cxhndl_x.obj \
-      $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # client main program
 cxhndlc.obj : cxhndlc.c cxhndl.h
 
 # client stub
 cxhndl_c.obj : cxhndl_c.c cxhndl.h
-   $(cc) $(cflags) $(cvars) $(WARN) cxhndl_c.c
-   $(cvtomf)
 
 # client auxiliary file
 cxhndl_x.obj : cxhndl_x.c cxhndl.h
-   $(cc) $(cflags) $(cvars) $(WARN) cxhndl_x.c
-   $(cvtomf)
 
 # Make the cxhndl server
 cxhndls : cxhndls.exe
 cxhndls.exe : cxhndls.obj cxhndlp.obj cxhndl_s.obj cxhndl_y.obj
-    $(link) $(conflags) -out:cxhndls.exe \
-      cxhndls.obj cxhndl_s.obj cxhndlp.obj cxhndl_y.obj \
-      $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(conlibs)
+    $(link) $(linkdebug) $(conflags) -out:cxhndls.exe \
+      cxhndls.obj cxhndlp.obj cxhndl_s.obj cxhndl_y.obj \
+      rpcrt4.lib $(conlibs)
 
 # server main loop
 cxhndls.obj : cxhndls.c cxhndl.h
 
 # remote procedures
-cxhndlp.obj  : cxhndlp.c cxhndl.h
+cxhndlp.obj : cxhndlp.c cxhndl.h
 
 # server stub file
 cxhndl_s.obj : cxhndl_s.c cxhndl.h
-   $(cc) $(cflags) $(cvars) $(WARN) cxhndl_s.c
-   $(cvtomf)
 
 # server auxiliary file
 cxhndl_y.obj : cxhndl_y.c cxhndl.h
-   $(cc) $(cflags) $(cvars) $(WARN) cxhndl_y.c
-   $(cvtomf)
 
 # Stubs, auxiliary and header file from the IDL file
 cxhndl.h cxhndl_c.c cxhndl_x.c cxhndl_s.c cxhndl_y.c : cxhndl.idl cxhndl.acf
-    midl -cpp_cmd $(cc) -cpp_opt "-E"  cxhndl.idl
+    midl -cpp_cmd $(cc) -cpp_opt "-E" cxhndl.idl
 
 # Clean up everything
 cleanall : clean