1 diff -u -r blktrace_orig/Makefile blktrace/Makefile 2 --- blktrace_orig/Makefile Mon Jul 28 15:10:40 2008 3 +++ blktrace/Makefile Mon Jul 28 15:11:56 2008 4 @@ -1,8 +1,8 @@ 5 CC = gcc 6 -CFLAGS = -Wall -O2 -g -W 7 +CFLAGS += -Wall -O2 -g -W 8 ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 9 PROGS = blkparse blktrace verify_blkparse blkrawverify 10 -LIBS = -lpthread 11 +LIBS += -lpthread 12 SCRIPTS = btrace 13 14 ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \ 15 @@ -34,7 +34,7 @@ 16 blkrawverify: blkrawverify.o 17 $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) 18 19 -$(PROGS): | depend 20 +$(PROGS): depend 21 22 docs: 23 $(MAKE) -C doc all 24 Only in blktrace: Makefile~ 25 diff -u -r blktrace_orig/btreplay/Makefile blktrace/btreplay/Makefile 26 --- blktrace_orig/btreplay/Makefile Mon Jul 28 15:10:40 2008 27 +++ blktrace/btreplay/Makefile Mon Jul 28 15:12:36 2008 28 @@ -6,18 +6,18 @@ 29 # 30 31 CC = gcc 32 -CFLAGS = -Wall -W -O2 -g 33 +CFLAGS += -Wall -W -O2 -g 34 INCS = -I. -I.. -I../btt 35 OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG 36 XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 37 override CFLAGS += $(INCS) $(XCFLAGS) $(OCFLAGS) 38 39 PROGS = btrecord btreplay 40 -LIBS = -laio -lrt 41 +LIBS += -laio -lrt 42 43 all: depend $(PROGS) 44 45 -$(PROGS): | depend 46 +$(PROGS): depend 47 48 docs: 49 $(MAKE) -C doc all 50 diff -u -r blktrace_orig/btt/Makefile blktrace/btt/Makefile 51 --- blktrace_orig/btt/Makefile Mon Jul 28 15:10:40 2008 52 +++ blktrace/btt/Makefile Mon Jul 28 15:12:54 2008 53 @@ -6,13 +6,13 @@ 54 # 55 56 CC = gcc 57 -CFLAGS = -Wall -W -O2 -g 58 +CFLAGS += -Wall -W -O2 -g 59 INCS = -I. -I.. 60 XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 61 override CFLAGS += $(INCS) $(XCFLAGS) 62 63 PROGS = btt 64 -LIBS = $(PLIBS) $(ELIBS) 65 +LIBS += $(PLIBS) $(ELIBS) 66 OBJS = args.o bt_timeline.o devmap.o devs.o dip_rb.o iostat.o latency.o \ 67 misc.o output.o proc.o seek.o trace.o trace_complete.o trace_im.o \ 68 trace_issue.o trace_queue.o trace_remap.o trace_requeue.o \ 69
