--- examples/makefile	Sun Mar  1 01:37:02 1998
+++ /home/andy/tmp/wrk/examples/makefile	Tue Nov  3 19:00:11 1998
@@ -1,10 +1,18 @@
-#CC = gcc -g -O5 -fno-exceptions
-CC = gcc -g -O5 
-CGANAL = ../cganal
-PTOC = ../ptoc
-PTOC_LIB = ../libptoc.a
-BGI_LIB = ../libXbgi.a
-GRAPH_LIB = -L/usr/X11/lib -lX11
+#
+# Compilers
+#
+CC?= cc
+CXX?= c++
+CGANAL = cganal
+PTOC = ptoc
+
+#
+# Include files and libraries
+#
+PTOC_INC = -I/usr/local/include/ptoc
+PTOC_LIB = -L/usr/local/lib -lptoc
+BGI_LIB = -L/usr/local/lib -lXbgi
+GRAPH_LIB = -L/usr/X11R6/lib -lX11
 MATH_LIB = -lm
 
 EXE = hello_c hello_cxx impact war2 trinor tpascal set_c set_cxx lister polut2 vibrkinp vibrtabl bgidemo
@@ -24,11 +32,11 @@
 hello.cxx: hello.pas
 	$(PTOC) -in hello.pas
 
-hello_c: hello.c $(PTOC_LIB) 
-	$(CC) -I.. -o hello_c hello.c $(PTOC_LIB)
+hello_c: hello.c
+	$(CC) $(PTOC_INC) -o hello_c hello.c $(PTOC_LIB)
 
-hello_cxx: hello.cxx $(PTOC_LIB)
-	$(CC) -I.. -o hello_cxx hello.cxx $(PTOC_LIB)
+hello_cxx: hello.cxx
+	$(CXX) $(PTOC_INC) -o hello_cxx hello.cxx $(PTOC_LIB)
 
 #----------------------------------------------------------------
 # Graphic example: BGIDEMO
@@ -36,8 +44,8 @@
 bgidemo.cxx: bgidemo.pas
 	$(PTOC) -turbo -preserve -analyze -in bgidemo.pas
 
-bgidemo: bgidemo.cxx $(PTOC_LIB) $(BGI_LIB)
-	$(CC) -I.. -DTURBO_PASCAL -funsigned-char -o bgidemo bgidemo.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB)
+bgidemo: bgidemo.cxx
+	$(CXX) $(PTOC_INC) -DTURBO_PASCAL -funsigned-char -o bgidemo bgidemo.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB)
 
 #----------------------------------------------------------------
 # Some numeric programs for Turbo Pascal
@@ -47,42 +55,42 @@
 vibrtabl.cxx: vibrtabl.pas
 	$(PTOC) -turbo -in vibrtabl.pas
 
-vibrtabl: vibrtabl.cxx $(PTOC_LIB) $(BGI_LIB)
-	$(CC) -I.. -DTURBO_PASCAL -o vibrtabl vibrtabl.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB)
+vibrtabl: vibrtabl.cxx
+	$(CXX) $(PTOC_INC) -DTURBO_PASCAL -o vibrtabl vibrtabl.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB)
 
 
 vibrkinp.cxx: vibrkinp.pas
 	$(PTOC) -turbo -in vibrkinp.pas
 
-vibrkinp: vibrkinp.cxx $(PTOC_LIB) $(BGI_LIB)
-	$(CC) -I.. -DTURBO_PASCAL -o vibrkinp vibrkinp.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB)
+vibrkinp: vibrkinp.cxx
+	$(CXX) $(PTOC_INC) -DTURBO_PASCAL -o vibrkinp vibrkinp.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB)
 
 
 polut2.cxx: polut2.pas
 	$(PTOC) -turbo -in polut2.pas
 
-polut2: polut2.cxx $(PTOC_LIB) $(BGI_LIB)
-	$(CC) -I.. -DTURBO_PASCAL -o polut2 polut2.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB)
+polut2: polut2.cxx
+	$(CXX) $(PTOC_INC) -DTURBO_PASCAL -o polut2 polut2.cxx $(PTOC_LIB) $(BGI_LIB) $(GRAPH_LIB) $(MATH_LIB)
 
 
 impact.cxx: impact.pas
 	$(PTOC) -turbo -in impact.pas
 
-impact: impact.cxx $(PTOC_LIB)
-	$(CC) -I.. -DTURBO_PASCAL -o impact impact.cxx $(PTOC_LIB) $(MATH_LIB)
+impact: impact.cxx
+	$(CXX) $(PTOC_INC) -DTURBO_PASCAL -o impact impact.cxx $(PTOC_LIB) $(MATH_LIB)
 
 trinor.cxx: trinor.pas
 	$(PTOC) -turbo -in trinor.pas
 
-trinor: trinor.cxx $(PTOC_LIB)
-	$(CC) -I.. -DTURBO_PASCAL -o trinor trinor.cxx $(PTOC_LIB) $(MATH_LIB)
+trinor: trinor.cxx
+	$(CXX) $(PTOC_INC) -DTURBO_PASCAL -o trinor trinor.cxx $(PTOC_LIB) $(MATH_LIB)
 
 
 war2.cxx: war2.pas
 	$(PTOC) -turbo -in war2.pas
 
-war2: war2.cxx $(PTOC_LIB)
-	$(CC) -I.. -DTURBO_PASCAL -o war2 war2.cxx $(PTOC_LIB) $(MATH_LIB)
+war2: war2.cxx
+	$(CXX) $(PTOC_INC) -DTURBO_PASCAL -o war2 war2.cxx $(PTOC_LIB) $(MATH_LIB)
 # This program reads data from files war2.txt, random.txt, coord.txt
 # and produce file xy2.txt. Your can compare this file with xy2orig.txt
 # produced by original Pascal program. 
@@ -97,8 +105,8 @@
 printer.cxx: printer.pas
 	$(PTOC) -turbo -init -in printer.pas
 
-lister: lister.cxx printer.cxx $(PTOC_LIB)
-	$(CC) -g -I.. -DTURBO_PASCAL -o lister lister.cxx printer.cxx $(PTOC_LIB) 
+lister: lister.cxx printer.cxx
+	$(CXX) $(PTOC_INC) -DTURBO_PASCAL -o lister lister.cxx printer.cxx $(PTOC_LIB) 
 
 #-------------------------------------------------------------------
 # Some tests for converter. This programms produce dummy output.
@@ -128,11 +136,11 @@
 set.c: set.pas
 	$(PTOC) -c -intset -in set.pas
 
-set_cxx: set.cxx $(PTOC_LIB)
-	$(CC) -I.. -o set_cxx set.cxx $(PTOC_LIB)
+set_cxx: set.cxx
+	$(CXX) $(PTOC_INC) -o set_cxx set.cxx $(PTOC_LIB)
 
-set_c: set.c $(PTOC_LIB)
-	$(CC) -I.. -o set_c set.c $(PTOC_LIB)
+set_c: set.c
+	$(CC) $(PTOC_INC) -o set_c set.c $(PTOC_LIB)
 
 # Test for Turbo Pascal
 
@@ -140,14 +148,16 @@
 	$(PTOC) -turbo -cstring -in tpascal.pas
 
 tpascal: tpascal.cxx
-	$(CC) -I.. -o tpascal -DTURBO_PASCAL tpascal.cxx $(PTOC_LIB)
-
-
+	$(CXX) $(PTOC_INC) -o tpascal -DTURBO_PASCAL tpascal.cxx $(PTOC_LIB)
 
 
+#
+# Erase intermediate files after generating binaries
+#
 
 clean:
-	rm -f $(EXE) *~ *.o core call.grp recur.prc
-
-
+	rm -f $(EXE) $(convert) *~ *.o *.core call.grp recur.prc \
+	hello.c hello.cxx impact.cxx war2.cxx trinor.cxx tpascal.cxx \
+	set.c set.cxx lister.cxx polut2.cxx vibrkinp.cxx vibrtabl.cxx \
+	bgidemo.cxx printer.cxx printer.h
 
