--- mstools/samples/rpc/hello/makefile	2018/08/09 18:21:58	1.1.1.2
+++ mstools/samples/rpc/hello/makefile	2018/08/09 18:24:13	1.1.1.3
@@ -1,72 +1,52 @@
 #*************************************************************#
 #**                                                         **#
 #**                 Microsoft RPC Examples                  **#
-#**		      hello Application			    **#
-#**	       Copyright(c) Microsoft Corp. 1992	    **#
+#**                   hello Application                     **#
+#**            Copyright(c) Microsoft Corp. 1992            **#
 #**                                                         **#
 #*************************************************************#
 
 !include <ntwin32.mak>
 
-!if "$(CPU)" == "i386"
-WARN = -W1
-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)
+   $(cc) $(cdebug) $(cflags) $(cvars) $<
 
 all : helloc hellos
 
 # Make the client side application helloc
 helloc : helloc.exe
 helloc.exe : helloc.obj hello_c.obj hello_x.obj
-    $(link) $(conflags) -out:helloc.exe \
+    $(link) $(linkdebug) $(conflags) -out:helloc.exe \
       helloc.obj hello_c.obj hello_x.obj \
-      rpcrt4.lib rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # helloc main program
 helloc.obj : helloc.c hello.h
 
 # helloc stub
 hello_c.obj : hello_c.c hello.h
-   $(cc) $(cflags) $(cvars) $(WARN) hello_c.c
-   $(cvtomf)
 
 # helloc auxiliary file
 hello_x.obj : hello_x.c hello.h
-   $(cc) $(cflags) $(cvars) $(WARN) hello_x.c
-   $(cvtomf)
 
 # Make the server side application
 hellos : hellos.exe
 hellos.exe : hellos.obj hellop.obj hello_s.obj hello_y.obj
-    $(link) $(conflags) -out:hellos.exe \
+    $(link) $(linkdebug) $(conflags) -out:hellos.exe \
       hellos.obj hello_s.obj hellop.obj hello_y.obj \
-      rpcrt4.lib rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # hello server main program
 hellos.obj : hellos.c hello.h
 
 # remote procedures
-hellop.obj	: hellop.c hello.h
+hellop.obj : hellop.c hello.h
 
 # hellos stub file
 hello_s.obj : hello_s.c hello.h
-   $(cc) $(cflags) $(cvars) $(WARN) hello_s.c
-   $(cvtomf)
 
 # hellos auxiliary file
 hello_y.obj : hello_y.c hello.h
-   $(cc) $(cflags) $(cvars) $(WARN) hello_y.c
-   $(cvtomf)
 
 # Stubs, auxiliary and header file from the IDL file
 hello.h hello_c.c hello_x.c hello_s.c hello_y.c : hello.idl hello.acf