--- Makefile.orig	Sun Feb 10 14:56:42 2002
+++ Makefile	Sun Dec  7 23:38:40 2003
@@ -1,6 +1,6 @@
-CC      = gcc
+CC      ?= gcc
 #INCDIR  = -I sndstretch
-CFLAGS  = -Wall -O6 $(INCDIR) `xmms-config --cflags`
+CFLAGS  += -Wall $(INCDIR) `xmms-config --cflags`
 #LDFLAGS = -lgthread -lpthread 
 LDFLAGS = -gthread -pthread `xmms-config --libs`
 
@@ -11,19 +11,19 @@
 all: effect_plugin output_plugin
 
 effect_plugin: sndstretch_xmms_eff.lo sndstretch.lo
-	$(CC) -shared sndstretch_xmms_eff.lo sndstretch.lo `gtk-config --libs` $(LDFLAGS) -lc -o sndstretch_xmms_eff.so
+	$(CC) -shared sndstretch_xmms_eff.lo sndstretch.lo `${GTK_CONFIG} --libs` ${THREADS} -lc -o sndstretch_xmms_eff.so
 
 output_plugin: sndstretch_xmms_out.lo sndstretch.lo
-	$(CC) -shared sndstretch_xmms_out.lo sndstretch.lo `gtk-config --libs` $(LDFLAGS) -lc -o sndstretch_xmms_out.so
+	$(CC) -shared sndstretch_xmms_out.lo sndstretch.lo `${GTK_CONFIG} --libs` ${THREADS} -lc -o sndstretch_xmms_out.so
 
 sndstretch_xmms_eff.lo: sndstretch_xmms.h sndstretch_xmms_eff.c sndstretch_xmms.c FB_logo.xpm sndstretch_xmms-logo.xpm
-	$(CC) $(CFLAGS) -O2 -fPIC -c sndstretch_xmms_eff.c `gtk-config --cflags` -o sndstretch_xmms_eff.lo
+	$(CC) $(CFLAGS) -fPIC -c sndstretch_xmms_eff.c `${GTK_CONFIG} --cflags` -o sndstretch_xmms_eff.lo
         
 sndstretch_xmms_out.lo: sndstretch_xmms.h sndstretch_xmms_out.c sndstretch_xmms.c FB_logo.xpm sndstretch_xmms-logo.xpm
-	$(CC) $(CFLAGS) -O2 -fPIC -c sndstretch_xmms_out.c `gtk-config --cflags` -o sndstretch_xmms_out.lo
+	$(CC) $(CFLAGS) -fPIC -c sndstretch_xmms_out.c `${GTK_CONFIG} --cflags` -o sndstretch_xmms_out.lo
         
 sndstretch.lo: sndstretch.c sndstretch.h
-	$(CC) $(CFLAGS) -O2 -fPIC -c sndstretch.c -o sndstretch.lo
+	$(CC) $(CFLAGS) -fPIC -c sndstretch.c -o sndstretch.lo
 
 install:
 	install sndstretch_xmms_out.so $(XMMS_OPLUGIN_DIR)