--- Makefile.orig	Fri Apr 21 11:47:57 2000
+++ Makefile	Fri Apr 21 11:59:25 2000
@@ -1,8 +1,6 @@
-CC=cc
-CXX=/usr/bin/c++
-CFLAGS=-I/usr/X11R6/include -I./Lib -I./Plugin -fpic -fno-rtti -DXP_UNIX
-CFLAGS+=-O2
+CFLAGS+=-I/usr/X11R6/include -I./Lib -I./Plugin -fpic -fno-rtti -DXP_UNIX
 CFLAGS+=-DCHECK_TEXT_PLAIN
+CXXFLAGS+=${CFLAGS}
 
 OBJS = adpcm.o bitmap.o button.o character.o cxform.o \
 	displaylist.o flash.o font.o graphic.o matrix.o \