--- mstools/samples/rpc/data/dunion/makefile	2018/08/09 18:20:59	1.1
+++ mstools/samples/rpc/data/dunion/makefile	2018/08/09 18:24:24	1.1.1.3
@@ -1,57 +1,40 @@
 #*************************************************************#
 #**                                                         **#
 #**                 Microsoft RPC Examples                  **#
-#**		      dunion Application		    **#
-#**	       Copyright(c) Microsoft Corp. 1992	    **#
+#**                   dunion Application                    **#
+#**            Copyright(c) Microsoft Corp. 1992            **#
 #**                                                         **#
 #*************************************************************#
 
 !include <ntwin32.mak>
 
-!if "$(CPU)" == "i386"
-cvtomf =
-WARN = -W1
-!endif
-!if "$(CPU)" == "MIPS"
-cvtomf = mip2coff $@
-WARN =
-!endif
-
 .c.obj:
-   $(cc) $(cflags) $(cvars) $<
-   $(cvtomf)
-
-.obj.exe:
-    $(link) $(conflags) -out:$(@R).exe $(@R).obj $(conlibs)
+   $(cc) $(cdebug) $(cflags) $(cvars) $<
 
 all : dunionc dunions
 
 # Make the dunionc
 dunionc : dunionc.exe
 dunionc.exe : dunionc.obj dunion_c.obj dunion_x.obj
-    $(link) $(conflags) -out:dunionc.exe \
+    $(link) $(linkdebug) $(conflags) -out:dunionc.exe \
       dunionc.obj dunion_c.obj dunion_x.obj \
-      $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # dunionc main program
 dunionc.obj : dunionc.c dunion.h
 
 # dunionc stub
 dunion_c.obj : dunion_c.c dunion.h
-   $(cc) $(cflags) $(cvars) $(WARN) dunion_c.c
-   $(cvtomf)
 
 # dunionc auxiliary file
 dunion_x.obj : dunion_x.c dunion.h
-   $(cc) $(cflags) $(cvars) $(WARN) dunion_x.c
-   $(cvtomf)
 
 # Make the dunions
 dunions : dunions.exe
 dunions.exe : dunions.obj dunionp.obj dunion_s.obj dunion_y.obj
-    $(link) $(conflags) -out:dunions.exe \
+    $(link) $(linkdebug) $(conflags) -out:dunions.exe \
       dunions.obj dunion_s.obj dunionp.obj dunion_y.obj \
-      $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # dunions main loop
 dunions.obj : dunions.c dunion.h
@@ -61,17 +44,13 @@ dunionp.obj  : dunionp.c dunion.h
 
 # dunions stub file
 dunion_s.obj : dunion_s.c dunion.h
-   $(cc) $(cflags) $(cvars) $(WARN) dunion_s.c
-   $(cvtomf)
 
 # dunions auxiliary file
 dunion_y.obj : dunion_y.c dunion.h
-   $(cc) $(cflags) $(cvars) $(WARN) dunion_y.c
-   $(cvtomf)
 
 # Stubs, auxiliary and header file from the IDL file
 dunion.h dunion_c.c dunion_x.c dunion_s.c dunion_y.c : dunion.idl dunion.acf
-    midl -cpp_cmd $(cc) -cpp_opt "-E"  dunion.idl
+    midl -cpp_cmd $(cc) -cpp_opt "-E" dunion.idl
 
 # Clean up everything
 cleanall : clean