--- mstools/samples/fontview/makefile	2018/08/09 18:20:49	1.1.1.1
+++ mstools/samples/fontview/makefile	2018/08/09 18:21:53	1.1.1.2
@@ -1,46 +1,23 @@
-# Nmake macros for building Windows 32-Bit apps
+PROJ = FONTVIEW
+SRC = FONTVIEW.C TOOLS.C STATUS.C DIALOGS.C DISPLAY.C
 
+# Nmake macros for building Windows 32-Bit apps
 !include <ntwin32.mak>
 
-# application specific C defines
-
-
-# This line allows NMAKE to work as well
-
-all: FontView.exe
-
-# Update the resource if necessary
-
-FontView.res: FontView.rc FontView.h
-    rc -r -fo FontView.res FontView.rc
-
-FontView.r32: FontView.RES
-    cvtres -$(CPU) FontView.res -o FontView.R32
-
-# Update the object file if necessary
-
-Display.obj: Display.c
-    $(cc) $(cflags) $(cvars) $(cf) display.c
-    $(cvtobj) Display.obj
-
-Dialogs.obj: Dialogs.c
-    $(cc) $(cflags) $(cvars) $(cf) Dialogs.c
-    $(cvtobj) Dialogs.obj
+all: $(PROJ).exe
 
-status.obj: status.c
-    $(cc) $(cflags) $(cvars) $(cf) status.c
-    $(cvtobj) status.obj
+# Inference Rules:
 
-tools.obj: tools.c
-    $(cc) $(cflags) $(cvars) $(cf) tools.c
-    $(cvtobj) tools.obj
+.c.obj:
+    $(cc) $(cdebug) $(cflags) $(cvars) $(cf) $<
 
-FontView.obj: FontView.c FontView.h
-    $(cc) $(cflags) $(cvars) $(cf) FontView.c
-    $(cvtobj) FontView.obj
+.rc.res:
+    rc -r $<
+    cvtres -$(CPU) -o $*.RBJ $*.RES
 
-# Update the executable file if necessary, and if so, add the resource back in.
+$(PROJ).hlp: $(PROJ).rtf $(PROJ).hpj
+    hc -n $(PROJ).hpj
 
-FontView.exe: FontView.obj TOOLS.obj STATUS.obj Dialogs.obj Display.obj FontView.r32 FontView.def
-    $(link) $(guiflags) -out:FontView.exe \
-    FontView.obj TOOLS.obj STATUS.obj Display.OBJ Dialogs.OBJ FontView.r32 $(guilibs)
+$(PROJ).exe: $(SRC:.C=.OBJ) $(PROJ).res $(PROJ).def $(PROJ).hlp
+    $(cvtobj) $(cvtdebug) *.obj
+    $(link) $(linkdebug) $(guiflags) -out:$(PROJ).exe $(SRC:.C=.OBJ) $(PROJ).rbj $(guilibs)