--- Makefile.orig	Tue Sep 27 14:14:43 2005
+++ Makefile	Tue Sep 27 14:15:30 2005
@@ -3,10 +3,10 @@
 # PIC programmer interface
 #
 
-CC=gcc
+CC=${CXX}
 APP=picp
 INCLUDES=-I.
-OPTIONS=-O2 -Wall -x c++
+OPTIONS=${CXXFLAGS} -Wall
 CFLAGS=$(INCLUDES) $(OPTIONS)
 SRCS=main.c serial.c picdev.c record.c parse.c atoi_base.c
 OBJECTS = main.o serial.o picdev.o record.o parse.o atoi_base.o
@@ -20,7 +20,6 @@
 
 $(APP): $(OBJECTS)
 	$(CC) $(OBJECTS) -lstdc++ -o $(APP)
-	strip $(APP)
 
 clean:
 	rm -f *.o