--- blktrace/btt/Makefile.orig	2007-08-15 12:00:39.260464020 -0500
+++ blktrace/btt/Makefile	2007-08-15 12:01:29.568789170 -0500
@@ -6,10 +6,11 @@
 #
 
 CC	= gcc
+CFLAGS	= -O2 -Wall -W -g
 INCS	= -I. -I..
 OCFLAGS	= -UCOUNT_IOS -UDEBUG -DNDEBUG
-XCFLAGS	= -Wall -W -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS	= $(INCS) -O2 $(XCFLAGS) $(OCFLAGS)
+XCFLAGS	= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ALL_CFLAGS = $(CFLAGS) $(INCS) $(XCFLAGS) $(OCFLAGS)
 
 PROGS	= btt
 LIBS	= $(PLIBS) $(ELIBS)
@@ -21,19 +22,19 @@
 all: depend $(PROGS)
 
 rbtree.o: ../rbtree.c
-	$(CC) -o $*.o -c $(CFLAGS) $<
+	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
 
 depend:
-	@$(CC) -MM $(CFLAGS) -I.. *.c 1> .depend
+	@$(CC) -MM $(ALL_CFLAGS) -I.. *.c 1> .depend
 
 clean: docsclean
 	-rm -f *.o $(PROGS) .depend
 
 %.o: %.c
-	$(CC) -o $*.o -c $(CFLAGS) $<
+	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
 
 btt: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
 docs:
 	$(MAKE) -C doc all