$NetBSD$

--- Makefile.orig	2003-12-02 17:09:48.000000000 +0000
+++ Makefile	2003-12-02 17:12:02.000000000 +0000
@@ -16,7 +16,7 @@
 INCLUDES=-I.
 
 OPTIONS=-O2 -Wall -x c++
-CFLAGS=$(INCLUDES) $(OPTIONS)
+CFLAGS += $(INCLUDES)
 
 OBJECTS = \
 	globals.o \
@@ -65,7 +65,7 @@
 all : tpasm
 
 tpasm : $(OBJECTS)
-	$(CC) -O $(OBJECTS) -o tpasm
+	$(CXX) $(CFLAGS) $(OBJECTS) -o tpasm
 
 clean :
 	rm -f *.o
@@ -79,5 +79,5 @@
 # suffix rules (this makes sure that the ".o" files
 # end up in their respective directories on all systems)
 .c.o:
-	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
+	${CXX} ${CFLAGS} ${CPPFLAGS} -o $@ -c $<
 
