From: Alan D. Brunelle <[EMAIL PROTECTED]>
Fixed Makefile back - had the DEBUG version enabled...
Signed-off-by: Alan D. Brunelle <[EMAIL PROTECTED]>
---
btt/Makefile | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/btt/Makefile b/btt/Makefile
index fcb09a4..920c70c 100644
--- a/btt/Makefile
+++ b/btt/Makefile
@@ -1,16 +1,17 @@
-CC = gcc
-
-ECFLAGS =
-# ECFLAGS = -DCOUNT_IOS
+#
+# OCFLAGS:
+# COUNT_IOS - Counts struct io's left at end
+# DEBUG - Various and sundy debug asserts
+# NDEBUG - Defined: no asserts, Undefined: asserts
+#
-# CFLAGS = -Wall -O2 -W -g $(ECFLAGS)
-CFLAGS = -Wall -g -W -UDO_INLINE -DDEBUG $(ECFLAGS)
+CC = gcc
+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)
-ALL_CFLAGS = $(CFLAGS) -I.. -D_GNU_SOURCE -D_LARGEFILE_SOURCE \
- -D_FILE_OFFSET_BITS=64
PROGS = btt
-#ELIBS = -lefence
-#PLIBS = -lpthread
LIBS = $(PLIBS) $(ELIBS)
OBJS = args.o bt_timeline.o devmap.o devs.o dip_rb.o iostat.o latency.o \
misc.o output.o proc.o seek.o trace.o trace_complete.o trace_im.o \
@@ -20,19 +21,19 @@ OBJS = args.o bt_timeline.o devmap.o devs.o dip_rb.o
iostat.o latency.o \
all: depend $(PROGS)
rbtree.o: ../rbtree.c
- $(CC) -o $*.o -c $(ALL_CFLAGS) $<
+ $(CC) -o $*.o -c $(CFLAGS) $<
depend:
- @$(CC) -MM $(ALL_CFLAGS) -I.. *.c 1> .depend
+ @$(CC) -MM $(CFLAGS) -I.. *.c 1> .depend
clean: docsclean
-rm -f *.o $(PROGS) .depend
%.o: %.c
- $(CC) -o $*.o -c $(ALL_CFLAGS) $<
+ $(CC) -o $*.o -c $(CFLAGS) $<
btt: $(OBJS)
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
docs:
$(MAKE) -C doc all
