projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: rewrite message handling
[fio.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 0b506e8e3981ac0557c2892dd2ea3f23d3c13142..2ff88a1d4b4549837ea0ecd4ac8504636301874c 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-36,19
+36,16
@@
ifdef CONFIG_GFIO
PROGS += gfio
endif
PROGS += gfio
endif
-SOURCE := gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \
+SOURCE := $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c)) \
+ $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/lib/*.c)) \
+ gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \
eta.c verify.c memory.c io_u.c parse.c mutex.c options.c \
eta.c verify.c memory.c io_u.c parse.c mutex.c options.c \
- lib/rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \
- lib/num2str.c lib/ieee754.c lib/strntol.c engines/cpu.c \
+ smalloc.c filehash.c profile.c debug.c engines/cpu.c \
engines/mmap.c engines/sync.c engines/null.c engines/net.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 lib/prio_tree.c lib/zipf.c lib/axmap.c lib/pattern.c \
- lib/lfsr.c gettime-thread.c helpers.c lib/flist_sort.c json.c \
- lib/hweight.c lib/getrusage.c idletime.c td_error.c \
+ server.c client.c iolog.c backend.c libfio.c flow.c cconv.c \
+ gettime-thread.c helpers.c json.c idletime.c td_error.c \
profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \
profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \
- lib/tp.c lib/bloom.c lib/gauss.c lib/mountcheck.c workqueue.c \
- lib/output_buffer.c \
- $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c))
+ workqueue.c rate-submit.c
ifdef CONFIG_LIBHDFS
HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE)
ifdef CONFIG_LIBHDFS
HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE)
@@
-100,19
+97,19
@@
ifdef CONFIG_RBD
SOURCE += engines/rbd.c
endif
ifndef CONFIG_STRSEP
SOURCE += engines/rbd.c
endif
ifndef CONFIG_STRSEP
- SOURCE += lib/strsep.c
+ SOURCE +=
os
lib/strsep.c
endif
ifndef CONFIG_STRCASESTR
endif
ifndef CONFIG_STRCASESTR
- SOURCE += lib/strcasestr.c
+ SOURCE +=
os
lib/strcasestr.c
endif
ifndef CONFIG_STRLCAT
endif
ifndef CONFIG_STRLCAT
- SOURCE += lib/strlcat.c
+ SOURCE +=
os
lib/strlcat.c
endif
ifndef CONFIG_GETOPT_LONG_ONLY
endif
ifndef CONFIG_GETOPT_LONG_ONLY
- SOURCE += lib/getopt_long.c
+ SOURCE +=
os
lib/getopt_long.c
endif
ifndef CONFIG_INET_ATON
endif
ifndef CONFIG_INET_ATON
- SOURCE += lib/inet_aton.c
+ SOURCE +=
os
lib/inet_aton.c
endif
ifdef CONFIG_GFAPI
SOURCE += engines/glusterfs.c
endif
ifdef CONFIG_GFAPI
SOURCE += engines/glusterfs.c
@@
-124,19
+121,19
@@
ifdef CONFIG_GFAPI
endif
ifdef CONFIG_MTD
SOURCE += engines/mtd.c
endif
ifdef CONFIG_MTD
SOURCE += engines/mtd.c
- SOURCE += lib/libmtd.c
- SOURCE += lib/libmtd_legacy.c
+ SOURCE +=
os
lib/libmtd.c
+ SOURCE +=
os
lib/libmtd_legacy.c
endif
ifeq ($(CONFIG_TARGET_OS), Linux)
SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
endif
ifeq ($(CONFIG_TARGET_OS), Linux)
SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
- engines/binject.c lib/linux-dev-lookup.c
+ engines/binject.c
os
lib/linux-dev-lookup.c
LIBS += -lpthread -ldl
LDFLAGS += -rdynamic
endif
ifeq ($(CONFIG_TARGET_OS), Android)
SOURCE += diskutil.c fifo.c blktrace.c trim.c profiles/tiobench.c \
LIBS += -lpthread -ldl
LDFLAGS += -rdynamic
endif
ifeq ($(CONFIG_TARGET_OS), Android)
SOURCE += diskutil.c fifo.c blktrace.c trim.c profiles/tiobench.c \
- lib/linux-dev-lookup.c
+
os
lib/linux-dev-lookup.c
LIBS += -ldl
LDFLAGS += -rdynamic
endif
LIBS += -ldl
LDFLAGS += -rdynamic
endif
@@
-216,14
+213,14
@@
T_LFSR_TEST_PROGS = t/lfsr-test
ifeq ($(CONFIG_TARGET_OS), Linux)
T_BTRACE_FIO_OBJS = t/btrace2fio.o
ifeq ($(CONFIG_TARGET_OS), Linux)
T_BTRACE_FIO_OBJS = t/btrace2fio.o
-T_BTRACE_FIO_OBJS += fifo.o lib/flist_sort.o t/log.o lib/linux-dev-lookup.o
+T_BTRACE_FIO_OBJS += fifo.o lib/flist_sort.o t/log.o
os
lib/linux-dev-lookup.o
T_BTRACE_FIO_PROGS = t/fio-btrace2fio
endif
T_DEDUPE_OBJS = t/dedupe.o
T_DEDUPE_OBJS += lib/rbtree.o t/log.o mutex.o smalloc.o gettime.o crc/md5.o \
T_BTRACE_FIO_PROGS = t/fio-btrace2fio
endif
T_DEDUPE_OBJS = t/dedupe.o
T_DEDUPE_OBJS += lib/rbtree.o t/log.o mutex.o smalloc.o gettime.o crc/md5.o \
-
memalign.o lib/bloom.o t/debug.o crc/xxhash.o crc/murmur3
.o \
- crc/crc32c.o crc/crc32c-intel.o crc/fnv.o
+
lib/memalign.o lib/bloom.o t/debug.o crc/xxhash
.o \
+ crc/
murmur3.o crc/
crc32c.o crc/crc32c-intel.o crc/fnv.o
T_DEDUPE_PROGS = t/fio-dedupe
T_OBJS = $(T_SMALLOC_OBJS)
T_DEDUPE_PROGS = t/fio-dedupe
T_OBJS = $(T_SMALLOC_OBJS)
@@
-238,7
+235,7
@@
ifneq (,$(findstring CYGWIN,$(CONFIG_TARGET_OS)))
T_DEDUPE_OBJS += os/windows/posix.o lib/hweight.o
T_SMALLOC_OBJS += os/windows/posix.o lib/hweight.o
T_LFSR_TEST_OBJS += os/windows/posix.o lib/hweight.o
T_DEDUPE_OBJS += os/windows/posix.o lib/hweight.o
T_SMALLOC_OBJS += os/windows/posix.o lib/hweight.o
T_LFSR_TEST_OBJS += os/windows/posix.o lib/hweight.o
- T_ZIPF_OBJS += lib/strcasestr.o
+ T_ZIPF_OBJS +=
os
lib/strcasestr.o
endif
T_TEST_PROGS = $(T_SMALLOC_PROGS)
endif
T_TEST_PROGS = $(T_SMALLOC_PROGS)
@@
-324,7
+321,14
@@
parse.o: lex.yy.o y.tab.o
endif
init.o: init.c FIO-VERSION-FILE
endif
init.o: init.c FIO-VERSION-FILE
+ @mkdir -p $(dir $@)
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
+ @$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SRCDIR)/$*.c > $*.d
+ @mv -f $*.d $*.d.tmp
+ @sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
+ @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+ sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
+ @rm -f $*.d.tmp
gcompat.o: gcompat.c gcompat.h
$(QUIET_CC)$(CC) $(CFLAGS) $(GTK_CFLAGS) $(CPPFLAGS) -c $<
gcompat.o: gcompat.c gcompat.h
$(QUIET_CC)$(CC) $(CFLAGS) $(GTK_CFLAGS) $(CPPFLAGS) -c $<
@@
-383,7
+387,7
@@
t/fio-dedupe: $(T_DEDUPE_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_DEDUPE_OBJS) $(LIBS)
clean: FORCE
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_DEDUPE_OBJS) $(LIBS)
clean: FORCE
- @rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) $(T_TEST_PROGS) core.* core gfio FIO-VERSION-FILE *.d lib/*.d crc/*.d engines/*.d profiles/*.d t/*.d config-host.mak config-host.h y.tab.[ch] lex.yy.c exp/*.[do] lexer.h
+ @rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) $(T_TEST_PROGS) core.* core gfio FIO-VERSION-FILE *.d lib/*.d
oslib/*.d
crc/*.d engines/*.d profiles/*.d t/*.d config-host.mak config-host.h y.tab.[ch] lex.yy.c exp/*.[do] lexer.h
distclean: clean FORCE
@rm -f cscope.out fio.pdf fio_generate_plots.pdf fio2gnuplot.pdf
distclean: clean FORCE
@rm -f cscope.out fio.pdf fio_generate_plots.pdf fio2gnuplot.pdf