Merge branch 'master' of ssh://router.home.kernel.dk/data/git/fio

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index 4f95a5da3f274493ef74b5a913fc645a39aa6e11..13baee837bf4d0ff06b07038f4c88fded5f5ab2a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,11 @@ PROGS  = fio
 SCRIPTS = fio_generate_plots
 OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \
        eta.o verify.o memory.o io_u.o parse.o mutex.o options.o \
-       rbtree.o diskutil.o fifo.o blktrace.o smalloc.o filehash.o helpers.o
+       rbtree.o diskutil.o fifo.o blktrace.o smalloc.o filehash.o helpers.o \
+       cgroup.o profile.o debug.o trim.o
+
+OBJS += lib/rand.o
+OBJS += lib/flist_sort.o
 
 OBJS += crc/crc7.o
 OBJS += crc/crc16.o
@@ -30,6 +34,9 @@ OBJS += engines/null.o
 OBJS += engines/net.o
 OBJS += engines/syslet-rw.o
 OBJS += engines/guasi.o
+OBJS += engines/binject.o
+
+OBJS += profiles/tiobench.o
 
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
@@ -56,10 +63,10 @@ $(PROGS): depend
 all: depend $(PROGS) $(SCRIPTS)
 
 clean:
-       -rm -f .depend cscope.out $(OBJS) $(PROGS) core.* core
+       -rm -f .depend $(OBJS) $(PROGS) core.* core
 
 cscope:
-       @cscope -b
+       @cscope -b -R
 
 install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)