From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 3 Dec 2012 13:38:08 +0000 (+0100)
Subject: gfio: bad merge in Makefile
X-Git-Tag: fio-2.1~57^2~39
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9a0db1e22a016bcdd91646b2e275051ff21c3038;hp=49758e11f3658686ccd1c61724a5eba142f3ee4f;p=fio.git

gfio: bad merge in Makefile

Inadverdently dropped lib/prio_tree.c, which we use for graph
tooltips.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/Makefile b/Makefile
index a521220f..367c19af 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,8 @@ SOURCE := gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \
 		lib/num2str.c lib/ieee754.c $(wildcard crc/*.c) engines/cpu.c \
 		engines/mmap.c engines/sync.c engines/null.c engines/net.c \
 		memalign.c server.c client.c iolog.c backend.c libfio.c flow.c \
-		cconv.c json.c lib/zipf.c lib/axmap.c lib/lfsr.c \
-		gettime-thread.c
+		cconv.c lib/prio_tree.c json.c lib/zipf.c lib/axmap.c \
+		lib/lfsr.c gettime-thread.c
 
 ifeq ($(UNAME), Linux)
   SOURCE += diskutil.c fifo.c blktrace.c helpers.c cgroup.c trim.c \