--- mstools/samples/rpc/handles/usrdef/makefile	2018/08/09 18:20:56	1.1
+++ mstools/samples/rpc/handles/usrdef/makefile	2018/08/09 18:24:18	1.1.1.3
@@ -1,76 +1,56 @@
 #*************************************************************#
 #**                                                         **#
 #**                 Microsoft RPC Examples                  **#
-#**		      usrdef Application		    **#
-#**	       Copyright(c) Microsoft Corp. 1992	    **#
+#**                   usrdef Application                    **#
+#**            Copyright(c) Microsoft Corp. 1992            **#
 #**                                                         **#
 #*************************************************************#
 
 !include <ntwin32.mak>
 
-!if "$(CPU)" == "i386"
-WARN = -W1
-cvtomf =
-!endif
-!if "$(CPU)" == "MIPS"
-WARN =
-cvtomf = mip2coff $@
-!endif
-
 .c.obj:
-   $(cc) $(cflags) $(cvars) $<
-   $(cvtomf)
+   $(cc) $(cdebug) $(cflags) $(cvars) $<
 
 all : usrdefc usrdefs
 
 # Make the usrdefc
 usrdefc : usrdefc.exe
 usrdefc.exe : usrdefc.obj usrdef_c.obj usrdef_x.obj
-    $(link) $(conflags) -out:usrdefc.exe \
+    $(link) $(linkdebug) $(conflags) -out:usrdefc.exe \
       usrdefc.obj usrdef_c.obj usrdef_x.obj \
-      $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(LIB)\rpcns4.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # usrdefc main program
 usrdefc.obj : usrdefc.c usrdef.h
 
 # usrdefc stub
 usrdef_c.obj : usrdef_c.c usrdef.h
-   $(cc) $(cflags) $(cvars) $(WARN) usrdef_c.c
-   $(cvtomf)
 
 # usrdefc auxiliary file
 usrdef_x.obj : usrdef_x.c usrdef.h
-   $(cc) $(cflags) $(cvars) $(WARN) usrdef_x.c
-   $(cvtomf)
 
 # Make the usrdefs
 usrdefs : usrdefs.exe
 usrdefs.exe : usrdefs.obj usrdefp.obj usrdef_s.obj usrdef_y.obj
-    $(link) $(conflags) -out:usrdefs.exe \
+    $(link) $(linkdebug) $(conflags) -out:usrdefs.exe \
       usrdefs.obj usrdef_s.obj usrdefp.obj usrdef_y.obj \
-      $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # usrdefs main loop
 usrdefs.obj : usrdefs.c usrdef.h
 
 # remote procedures
-usrdefp.obj  : usrdefp.c usrdef.h
-   $(cc) $(cflags) $(cvars) $(WARN) usrdefp.c
-   $(cvtomf)
+usrdefp.obj : usrdefp.c usrdef.h
 
 # usrdefs stub file
 usrdef_s.obj : usrdef_s.c usrdef.h
-   $(cc) $(cflags) $(cvars) $(WARN) usrdef_s.c
-   $(cvtomf)
 
 # usrdefs auxiliary file
 usrdef_y.obj : usrdef_y.c usrdef.h
-   $(cc) $(cflags) $(cvars) $(WARN) usrdef_y.c
-   $(cvtomf)
 
 # Stubs, auxiliary and header file from the IDL file
 usrdef.h usrdef_c.c usrdef_x.c usrdef_s.c usrdef_y.c : usrdef.idl usrdef.acf
-    midl -cpp_cmd $(cc) -cpp_opt "-E"  usrdef.idl
+    midl -cpp_cmd $(cc) -cpp_opt "-E" usrdef.idl
 
 # Clean up everything
 cleanall : clean
@@ -85,4 +65,3 @@ clean :
     -del usrdef_s.c
     -del usrdef_y.c
     -del usrdef.h
-