blktrace: don't stop tracer if not setup trace successfully

[blktrace.git] / Makefile

diff --git a/Makefile b/Makefile
index e26560544c5f97e8d398d7dfe54741e3de3f95f6..5917814d03440ef2abbb9a144312444cbbda932b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,89 @@
 CC     = gcc
-CFLAGS = -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-PROGS  = blkparse blktrace verify_blkparse
+CFLAGS = -Wall -O2 -g -W
+ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+PROGS  = blkparse blktrace verify_blkparse blkrawverify blkiomon
 LIBS   = -lpthread
 SCRIPTS        = btrace
+SUBDIRS = btreplay btt iowatcher
 
-all: depend $(PROGS) $(SCRIPTS)
+ALL = $(PROGS) $(SCRIPTS)
+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \
+      btt/bno_plot.py iowatcher/iowatcher
+
+all: $(ALL) $(SUBDIRS)
+
+# We always descend into subdirs because they contain their own dependency
+# information which we don't track in this top level Makefile.
+$(SUBDIRS):
+       $(MAKE) -C $@
+.PHONY: $(SUBDIRS)
+
+%.o: %.c
+       $(CC) -o $*.o -c $(ALL_CFLAGS) $<
 
 blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
-       $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
+       $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
 
-blktrace: blktrace.o act_mask.o $(LIBS)
-       $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+blktrace: blktrace.o act_mask.o
+       $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
 verify_blkparse: verify_blkparse.o
-       $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
+       $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+
+blkrawverify: blkrawverify.o
+       $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+
+blkiomon: blkiomon.o rbtree.o
+       $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
+
+$(PROGS): | depend
 
 docs:
        $(MAKE) -C doc all
+       $(MAKE) -C btt docs
+       $(MAKE) -C btreplay docs
 
 docsclean:
        $(MAKE) -C doc clean
+       $(MAKE) -C btt clean
+       $(MAKE) -C btreplay clean
 
 depend:
-       @$(CC) -MM $(CFLAGS) *.c 1> .depend
-
-clean: docsclean
-       -rm -f *.o $(PROGS) .depend
+       @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
 
 INSTALL = install
 prefix = /usr/local
 bindir = $(prefix)/bin
+mandir = $(prefix)/man
+RPMBUILD = rpmbuild
+TAR = tar
+
+export prefix INSTALL TAR
+
+dist: btrace.spec
+       git-tar-tree HEAD btrace-1.0 > btrace-1.0.tar
+       @mkdir -p btrace-1.0
+       @cp btrace.spec btrace-1.0
+       $(TAR) rf btrace-1.0.tar btrace-1.0/btrace.spec
+       @rm -rf btrace-1.0
+       @bzip2 btrace-1.0.tar
+
+rpm: dist
+       $(RPMBUILD) -ta btrace-1.0.tar.bz2
+
+clean: docsclean
+       -rm -f *.o $(PROGS) .depend btrace-1.0.tar.bz2
+       $(MAKE) -C btt clean
+       $(MAKE) -C btreplay clean
+       $(MAKE) -C iowatcher clean
 
-install: $(PROGS) $(SCRIPTS)
-       $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
-       $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
+install: all
+       $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
+       $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir)
+       $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8
 
 ifneq ($(wildcard .depend),)
 include .depend