--- Makefile.orig	2009-02-24 20:50:39.000000000 +0100
+++ Makefile	2009-02-24 20:52:30.000000000 +0100
@@ -2,8 +2,8 @@
 
 CC = gcc
 
-CFLAGS = -g -I/usr/X11R6/include `pkg-config --cflags gtk+-2.0` -Wall
-DFLAGS = -L/usr/X11R6/lib `pkg-config --libs gtk+-2.0`  -Wall
+MY_CFLAGS = -I/usr/X11R6/include `pkg-config --cflags gtk+-2.0`
+MY_DFLAGS = -L/usr/X11R6/lib `pkg-config --libs gtk+-2.0`
 LIBS = -lm
 
 OBJS = main.o setup_menu.o callback_menu.o help.o options.o \
@@ -15,21 +15,21 @@
 all:	make_db pixelize
 
 merge:	merge.o read_line.o stats.o
-	$(CC) -o $@ merge.o read_line.o stats.o $(DFLAGS) $(LIBS)
+	$(CC) -o $@ merge.o read_line.o stats.o $(LDFLAGS) $(MY_DFLAGS) $(LIBS)
 
 make_db:	make_db.o
-	$(CC) -o $@ make_db.o $(DFLAGS) $(LIBS)
+	$(CC) -o $@ make_db.o $(LDFLAGS) $(MY_DFLAGS) $(LIBS)
 
 #	$(CC) -o $@ make_db.o `pkg-config --libs imlib2` $(LIBS)
 
 pixelize:	$(OBJS)
-	$(CC) -o $@ $(OBJS) $(DFLAGS) $(LIBS)
+	$(CC) -o $@ $(OBJS) $(LDFLAGS) $(MY_DFLAGS) $(LIBS)
 
 .c.o:
-	$(CC) -c -o $@ $(CFLAGS) $<
+	$(CC) -c -o $@ $(CFLAGS) $(MY_CFLAGS) $<
 
 depend:
-	$(CC) -MM $(CFLAGS) *.c > depend
+	$(CC) -MM $(CFLAGS) $(MY_CFLAGS) *.c > depend
 
 clean:
 	rm -f *.o pixelize make_db core