--- work/dev/makefile.orig	Fri Nov 27 23:34:50 1998
+++ work/dev/makefile	Sun Sep  8 13:29:35 2002
@@ -1,10 +1,7 @@
 # This is a unified GNU Makfefile for all "other" targets - type "make"
 # to get a list of targets!
 
-CC = gcc
-
-# Optimization
-OPT = -O2
+CXX ?= c++
 
 # Name of executable
 EXE = uox3.exe
@@ -27,7 +24,7 @@
 # Objects
 OBJS := $(patsubst %.cpp, %.o, $(SRC))
 
-C_FLAGS = $(WARN) $(OTHER) $(OPT) $(DEBUG)
+C_FLAGS = $(CXXFLAGS) $(WARN) $(OTHER) $(DEBUG)
 
 all:
 	@echo Please specify one of the following:
@@ -51,10 +48,10 @@
 
 
 $(EXE): $(OBJS)
-	$(CC) -o $@ $(OBJS) $(LIBS)
+	$(CXX) -o $@ $(OBJS) $(LIBS)
 	
 %.o: %.cpp uox3.h
-	$(CC) -c $(C_FLAGS) $< -o $@
+	$(CXX) -c $(C_FLAGS) $< -o $@
 
 clean:
 	rm -f *.o uox3