--- mstools/samples/rpc/whello/makefile	2018/08/09 18:20:56	1.1
+++ mstools/samples/rpc/whello/makefile	2018/08/09 18:24:15	1.1.1.3
@@ -1,72 +1,50 @@
 #*************************************************************#
 #**                                                         **#
 #**                 Microsoft RPC Examples                  **#
-#**		       whello Application		    **#
+#**                    whello Application                   **#
 #**            Copyright(c) Microsoft Corp. 1991            **#
 #**                                                         **#
 #*************************************************************#
 
 !include <ntwin32.mak>
 
-all: whellos whelloc
-
-!if "$(CPU)" == "i386"
-cvtomf =
-WARN = -W1
-!endif
-
-!if "$(CPU)" == "MIPS"
-cvtomf = mip2coff $@
-WARN =
-!endif
-
 .c.obj:
-   $(cc) $(cflags) $(cvars) $(RPCFLAG) $<
-   $(cvtomf)
+   $(cc) $(cdebug) $(cflags) $(cvars) $<
 
-# Update the resource if necessary
-whello.res: whello.rc whello.h rpc.ico whello.dlg
-    rc -r -fo whello.tmp whello.rc
-    cvtres -$(CPU) whello.tmp -o whello.res
-    del whello.tmp
+all: whellos whelloc
 
-# Update the object file if necessary
-whelloc.obj: whelloc.c whelloc.h whello.h
+# Update the resource if necessary
+whello.rbj: whello.rc whello.h rpc.ico whello.dlg
+    rc -r whello.rc
+    cvtres -$(CPU) whello.res -o whello.rbj
 
 # Update the executable file if necessary, and if so, add the resource back in.
 whelloc : whelloc.exe
+whelloc.exe : whelloc.obj whello.def whello_c.obj whello_x.obj whello.rbj
+    $(link) $(linkdebug) $(guiflags) -out:whelloc.exe -map:whelloc.map \
+      whelloc.obj whello_c.obj whello_x.obj whello.rbj \
+      rpcrt4.lib $(guilibs)
 
-whelloc.exe : whelloc.obj whello.def whello_c.obj whello_x.obj whello.res
-    $(link) $(guiflags) -out:whelloc.exe -map:whelloc.map \
-      whelloc.obj whello_c.obj whello_x.obj whello.res	\
-      $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(guilibs)
+whelloc.obj : whelloc.c whelloc.h whello.h
 
 whello_c.obj : whello_c.c whello.h
-   $(cc) $(cflags) $(cvars) $(RPCFLAG) $(WARN) whello_c.c
-   $(cvtomf)
 
 whello_x.obj : whello_x.c whello.h
-   $(cc) $(cflags) $(cvars) $(RPCFLAG) $(WARN) whello_x.c
-   $(cvtomf)
 
 # Make the whellos
 whellos : whellos.exe
 whellos.exe : whellos.obj whellop.obj whello_s.obj whello_y.obj
-    $(link) $(conflags) -out:whellos.exe -map:whellos.map \
+    $(link) $(linkdebug) $(conflags) -out:whellos.exe -map:whellos.map \
       whellos.obj whellop.obj whello_s.obj whello_y.obj \
-      $(LIB)\rpcrt4.lib $(LIB)\rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 whellos.obj : whellos.c whello.h
 
-whellop.obj  : whellop.c whello.h
+whellop.obj : whellop.c whello.h
 
 whello_s.obj : whello_s.c whello.h
-   $(cc) $(cflags) $(cvars) $(RPCFLAG) $(WARN) whello_s.c
-   $(cvtomf)
 
 whello_y.obj : whello_y.c whello.h
-   $(cc) $(cflags) $(cvars) $(RPCFLAG) $(WARN) whello_y.c
-   $(cvtomf)
 
 # Make the stubs source
 whello.h whello_c.c whello_x.c whello_s.c whello_y.c : whello.idl whello.acf
@@ -80,7 +58,8 @@ cleanall : clean
 clean :
     -del *.obj
     -del *.map
-    -del *.res
+    -del whello.res
+    -del whello.rbj
     -del whello_c.c
     -del whello_x.c
     -del whello_s.c