--- mstools/samples/rpc/doctor/makefile	2018/08/09 18:22:07	1.1.1.2
+++ mstools/samples/rpc/doctor/makefile	2018/08/09 18:24:23	1.1.1.3
@@ -1,56 +1,40 @@
 #*************************************************************#
 #**                                                         **#
 #**                 Microsoft RPC Examples                  **#
-#**		      doctor Application		    **#
-#**	       Copyright(c) Microsoft Corp. 1992	    **#
+#**                   doctor Application                    **#
+#**            Copyright(c) Microsoft Corp. 1992            **#
 #**                                                         **#
 #*************************************************************#
 
 !include <ntwin32.mak>
 
-!if "$(CPU)" == "i386"
-cvtomf =
-WARN = -W1
-# workaround for Windows NT 10/92 beta
-cflags = $(cflags:G3=Gz)
-!endif
-!if "$(CPU)" == "MIPS"
-WARN =
-cvtomf = mip2coff $@
-!endif
-
 .c.obj:
-   $(cc) $(cflags) $(cvars) $(DEBUG) $<
-   $(cvtomf)
+   $(cc) $(cdebug) $(cflags) $(cvars) $(DEBUG) $<
 
 all : doctorc doctors
 
 # Make the doctor client executable
 doctorc : doctorc.exe
 doctorc.exe : doctorc.obj doctor_c.obj doctor_x.obj
-    $(link) $(conflags) -out:doctorc.exe \
+    $(link) $(linkdebug) $(conflags) -out:doctorc.exe \
       doctorc.obj doctor_c.obj doctor_x.obj \
-      rpcrt4.lib rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # client main program
 doctorc.obj : doctorc.c doctor.h
 
 # client stub
 doctor_c.obj : doctor_c.c doctor.h
-   $(cc) $(cflags) $(cvars) $(WARN) $(DEBUG)  doctor_c.c
-   $(cvtomf)
 
 # client auxiliary file
 doctor_x.obj : doctor_x.c doctor.h
-   $(cc) $(cflags) $(cvars) $(WARN) $(DEBUG) doctor_x.c
-   $(cvtomf)
 
 # Make the doctor server executable
 doctors : doctors.exe
 doctors.exe : doctors.obj doctorp.obj doctor_s.obj doctor_y.obj
-    $(link) $(conflags) -out:doctors.exe \
+    $(link) $(linkdebug) $(conflags) -out:doctors.exe \
       doctors.obj doctor_s.obj doctorp.obj doctor_y.obj \
-      rpcrt4.lib rpcndr.lib $(conlibs)
+      rpcrt4.lib $(conlibs)
 
 # server main loop
 doctors.obj : doctors.c doctor.h
@@ -60,17 +44,13 @@ doctorp.obj  : doctorp.c doctor.h
 
 # server stub file
 doctor_s.obj : doctor_s.c doctor.h
-   $(cc) $(cflags) $(cvars) $(WARN) $(DEBUG) doctor_s.c
-   $(cvtomf)
 
 # server auxiliary file
 doctor_y.obj : doctor_y.c doctor.h
-   $(cc) $(cflags) $(cvars) $(WARN) $(DEBUG) doctor_y.c
-   $(cvtomf)
 
 # Stubs, auxiliary and header file from the IDL file
 doctor.h doctor_c.c doctor_x.c doctor_s.c doctor_y.c : doctor.idl doctor.acf
-    midl -cpp_cmd $(cc) -cpp_opt "-E"  doctor.idl
+    midl -cpp_cmd $(cc) -cpp_opt "-E" -ms_ext doctor.idl
 
 # Clean up everything
 cleanall : clean