projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compiler warning and test progs linker errors on Windows
[fio.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 1227eb9f2faf0382d26685221842ceb9e74b6138..d9aedf52c5a1126b9e6b811e397b5c78b742fd9e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-36,7
+36,7
@@
SOURCE := gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \
lib/lfsr.c gettime-thread.c helpers.c lib/flist_sort.c \
lib/hweight.c lib/getrusage.c idletime.c td_error.c \
profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \
lib/lfsr.c gettime-thread.c helpers.c lib/flist_sort.c \
lib/hweight.c lib/getrusage.c idletime.c td_error.c \
profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \
- lib/tp.c lib/bloom.c lib/gauss.c
+ lib/tp.c lib/bloom.c lib/gauss.c
workqueue.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)
@@
-107,6
+107,11
@@
ifdef CONFIG_GFAPI
CFLAGS += "-DGFAPI_USE_FADVISE"
endif
endif
CFLAGS += "-DGFAPI_USE_FADVISE"
endif
endif
+ifdef CONFIG_MTD
+ SOURCE += engines/mtd.c
+ SOURCE += lib/libmtd.c
+ SOURCE += lib/libmtd_legacy.c
+endif
ifeq ($(CONFIG_TARGET_OS), Linux)
SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
ifeq ($(CONFIG_TARGET_OS), Linux)
SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
@@
-182,7
+187,7
@@
T_IEEE_OBJS += lib/ieee754.o
T_IEEE_PROGS = t/ieee754
T_ZIPF_OBS = t/genzipf.o
T_IEEE_PROGS = t/ieee754
T_ZIPF_OBS = t/genzipf.o
-T_ZIPF_OBJS += t/log.o lib/ieee754.o lib/rand.o lib/zipf.o t/genzipf.o
+T_ZIPF_OBJS += t/log.o lib/ieee754.o lib/rand.o lib/zipf.o
lib/gauss.o
t/genzipf.o
T_ZIPF_PROGS = t/fio-genzipf
T_AXMAP_OBJS = t/axmap.o
T_ZIPF_PROGS = t/fio-genzipf
T_AXMAP_OBJS = t/axmap.o
@@
-213,6
+218,12
@@
T_OBJS += $(T_LFSR_TEST_OBJS)
T_OBJS += $(T_BTRACE_FIO_OBJS)
T_OBJS += $(T_DEDUPE_OBJS)
T_OBJS += $(T_BTRACE_FIO_OBJS)
T_OBJS += $(T_DEDUPE_OBJS)
+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
+endif
+
T_TEST_PROGS = $(T_SMALLOC_PROGS)
T_TEST_PROGS += $(T_IEEE_PROGS)
T_PROGS += $(T_ZIPF_PROGS)
T_TEST_PROGS = $(T_SMALLOC_PROGS)
T_TEST_PROGS += $(T_IEEE_PROGS)
T_PROGS += $(T_ZIPF_PROGS)
@@
-238,7
+249,7
@@
ifeq ($(CONFIG_TARGET_OS), SunOS)
else
INSTALL = install
endif
else
INSTALL = install
endif
-prefix =
/usr/local
+prefix =
$(INSTALL_PREFIX)
bindir = $(prefix)/bin
ifeq ($(CONFIG_TARGET_OS), Darwin)
bindir = $(prefix)/bin
ifeq ($(CONFIG_TARGET_OS), Darwin)