--- a/Makefile
+++ b/Makefile
@@ -16,12 +16,11 @@
 GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
 GTK_LIB = `$(GTK_CONFIG) --libs`
 
-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+CFLAGS += -Wall -fPIC
+CPPFLAGS += $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
 LIBS = $(GTK_LIB)
 LFLAGS = -shared
 
-CC = gcc $(CFLAGS) $(FLAGS)
-
 OBJS = wireless.o
 
 PLUGIN_DIR = /usr/lib/gkrellm2/plugins
@@ -32,7 +31,7 @@
 all:	wireless.so
 
 wireless.so: $(OBJS)
-	$(CC) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS)
+	$(CC) $(LDFLAGS) $^ -o $@ $(LFLAGS) $(LIBS)
 
 clean:
 	rm -f *.o core *.so* *.bak *~