--- a/Makefile	2009-06-09 10:20:10.000000000 -0500
+++ b/Makefile	2009-06-09 10:29:31.000000000 -0500
@@ -43,13 +43,9 @@
             else echo Bleeding Edge Version; \
         fi;)
 
-CC = gcc
-CPPFLAGS =
-
 # for production
-CFLAGS = -O2 -DNDEBUG -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \
+CFLAGS += -DNDEBUG "-DXROOTCONSOLE_VERSION=\"$(VERSION)\"" \
     -I /usr/X11R6/include
-LDFLAGS = -s
 
 # for testing
 #CFLAGS = -g -Wall "-DXROOTCONSOLE_VERSION=\"$(VERSION) (debug build)\"" \
@@ -66,7 +62,7 @@
 all: $(EXEC)
 
 $(EXEC): $(OBJS) Makefile
-	$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+	$(LINK.c) $(OBJS) $(LIBS) -o $@
 
 $(OBJS): %.o: %.c util.h Makefile