projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettime: initialize cpusets properly
[fio.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 1968e31dea66950f24bd461a20beb97d7d01bcbe..52e515b04f01f87189e41223a02e2d702f959882 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-40,7
+40,7
@@
SOURCE := gettime.c ioengines.c init.c stat.c log.c time.c filesetup.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)
- HDFSLIB=
$(JAVA_HOME)/jre/lib/amd64/server/libjvm.so $(FIO_LIBHDFS_LIB)/lib
libhdfs.a
+ HDFSLIB=
-Wl,-rpath $(JAVA_HOME)/jre/lib/amd64/server -L$(JAVA_HOME)/jre/lib/amd64/server -ljvm $(FIO_LIBHDFS_LIB)/
libhdfs.a
CFLAGS += $(HDFSFLAGS)
SOURCE += engines/libhdfs.c
endif
CFLAGS += $(HDFSFLAGS)
SOURCE += engines/libhdfs.c
endif
@@
-136,6
+136,10
@@
ifeq ($(CONFIG_TARGET_OS), NetBSD)
LIBS += -lpthread -lrt
LDFLAGS += -rdynamic
endif
LIBS += -lpthread -lrt
LDFLAGS += -rdynamic
endif
+ifeq ($(CONFIG_TARGET_OS), DragonFly)
+ LIBS += -lpthread -lrt
+ LDFLAGS += -rdynamic
+endif
ifeq ($(CONFIG_TARGET_OS), AIX)
LIBS += -lpthread -ldl -lrt
CPPFLAGS += -D_LARGE_FILES -D__ppc__
ifeq ($(CONFIG_TARGET_OS), AIX)
LIBS += -lpthread -ldl -lrt
CPPFLAGS += -D_LARGE_FILES -D__ppc__
@@
-159,13
+163,14
@@
OBJS = $(SOURCE:.c=.o)
FIO_OBJS = $(OBJS) fio.o
FIO_OBJS = $(OBJS) fio.o
+GFIO_OBJS = $(OBJS) gfio.o graph.o tickmarks.o ghelpers.o goptions.o gerror.o \
+ gclient.o gcompat.o cairo_text_helpers.o printing.o
+
ifdef CONFIG_ARITHMETIC
FIO_OBJS += lex.yy.o y.tab.o
ifdef CONFIG_ARITHMETIC
FIO_OBJS += lex.yy.o y.tab.o
+GFIO_OBJS += lex.yy.o y.tab.o
endif
endif
-GFIO_OBJS = $(OBJS) gfio.o graph.o tickmarks.o ghelpers.o goptions.o gerror.o \
- gclient.o gcompat.o cairo_text_helpers.o printing.o
-
-include $(OBJS:.o=.d)
T_SMALLOC_OBJS = t/stest.o
-include $(OBJS:.o=.d)
T_SMALLOC_OBJS = t/stest.o
@@
-178,7
+183,7
@@
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_OBS = t/genzipf.o
T_ZIPF_OBJS += t/log.o lib/ieee754.o lib/rand.o lib/zipf.o t/genzipf.o
-T_ZIPF_PROGS = t/genzipf
+T_ZIPF_PROGS = t/
fio-
genzipf
T_AXMAP_OBJS = t/axmap.o
T_AXMAP_OBJS += lib/lfsr.o lib/axmap.o
T_AXMAP_OBJS = t/axmap.o
T_AXMAP_OBJS += lib/lfsr.o lib/axmap.o
@@
-191,16
+196,14
@@
T_LFSR_TEST_PROGS = t/lfsr-test
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
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_PROGS = t/btrace2fio
+T_BTRACE_FIO_PROGS = t/
fio-
btrace2fio
endif
endif
-ifeq ($(CONFIG_TARGET_OS), Linux)
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
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
-T_DEDUPE_PROGS = t/dedupe
-endif
+T_DEDUPE_PROGS = t/fio-dedupe
T_OBJS = $(T_SMALLOC_OBJS)
T_OBJS += $(T_IEEE_OBJS)
T_OBJS = $(T_SMALLOC_OBJS)
T_OBJS += $(T_IEEE_OBJS)
@@
-210,11
+213,11
@@
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)
-T_PROGS = $(T_SMALLOC_PROGS)
-T_PROGS += $(T_IEEE_PROGS)
+T_
TEST_
PROGS = $(T_SMALLOC_PROGS)
+T_
TEST_
PROGS += $(T_IEEE_PROGS)
T_PROGS += $(T_ZIPF_PROGS)
T_PROGS += $(T_ZIPF_PROGS)
-T_PROGS += $(T_AXMAP_PROGS)
-T_PROGS += $(T_LFSR_TEST_PROGS)
+T_
TEST_
PROGS += $(T_AXMAP_PROGS)
+T_
TEST_
PROGS += $(T_LFSR_TEST_PROGS)
T_PROGS += $(T_BTRACE_FIO_PROGS)
T_PROGS += $(T_DEDUPE_PROGS)
T_PROGS += $(T_BTRACE_FIO_PROGS)
T_PROGS += $(T_DEDUPE_PROGS)
@@
-223,8
+226,10
@@
PROGS += $(T_PROGS)
ifneq ($(findstring $(MAKEFLAGS),s),s)
ifndef V
QUIET_CC = @echo ' ' CC $@;
ifneq ($(findstring $(MAKEFLAGS),s),s)
ifndef V
QUIET_CC = @echo ' ' CC $@;
- QUIET_LINK = @echo ' ' LINK $@;
- QUIET_DEP = @echo ' ' DEP $@;
+ QUIET_LINK = @echo ' ' LINK $@;
+ QUIET_DEP = @echo ' ' DEP $@;
+ QUIET_YACC = @echo ' ' YACC $@;
+ QUIET_LEX = @echo ' ' LEX $@;
endif
endif
endif
endif
@@
-244,7
+249,7
@@
mandir = $(prefix)/man
sharedir = $(prefix)/share/fio
endif
sharedir = $(prefix)/share/fio
endif
-all: $(PROGS) $(SCRIPTS) FORCE
+all: $(PROGS) $(
T_TEST_PROGS) $(
SCRIPTS) FORCE
.PHONY: all install clean
.PHONY: FORCE cscope
.PHONY: all install clean
.PHONY: FORCE cscope
@@
-265,6
+270,9
@@
override CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
@rm -f $*.d.tmp
ifdef CONFIG_ARITHMETIC
@rm -f $*.d.tmp
ifdef CONFIG_ARITHMETIC
+lex.yy.c: exp/expression-parser.l
+ $(QUIET_LEX)$(LEX) exp/expression-parser.l
+
lex.yy.o: lex.yy.c y.tab.h
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
lex.yy.o: lex.yy.c y.tab.h
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
@@
-272,18
+280,11
@@
y.tab.o: y.tab.c y.tab.h
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
y.tab.c: exp/expression-parser.y
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
y.tab.c: exp/expression-parser.y
- $(QUIET_CC)$(YACC) -d exp/expression-parser.y
-
-y.tab.h: y.tab.c exp/fixup-buggy-yacc-output
- @exp/fixup-buggy-yacc-output $@
+ $(QUIET_YACC)$(YACC) -l -d -b y exp/expression-parser.y
-lex.yy.c: exp/expression-parser.l
- $(QUIET_CC)$(LEX) exp/expression-parser.l
+y.tab.h: y.tab.c
-exp/fixup-buggy-yacc-output.o: exp/fixup-buggy-yacc-output.c
- $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
-exp/fixup-buggy-yacc-output: exp/fixup-buggy-yacc-output.o
- $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) $< -o $@
+lexer.h: lex.yy.c
exp/test-expression-parser.o: exp/test-expression-parser.c
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
exp/test-expression-parser.o: exp/test-expression-parser.c
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
@@
-330,12
+331,12
@@
t/ieee754: $(T_IEEE_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_IEEE_OBJS) $(LIBS)
fio: $(FIO_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_IEEE_OBJS) $(LIBS)
fio: $(FIO_OBJS)
- $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(FIO_OBJS) $(
PARSER_OBJS) $(
LIBS) $(HDFSLIB)
+ $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(FIO_OBJS) $(LIBS) $(HDFSLIB)
gfio: $(GFIO_OBJS)
gfio: $(GFIO_OBJS)
- $(QUIET_LINK)$(CC) $(
LDFLAGS) -o gfio $(GFIO_OBJS) $(PARSER_OBJS) $(LIBS) $(GTK_LDFLAGS
)
+ $(QUIET_LINK)$(CC) $(
filter-out -static, $(LDFLAGS)) -o gfio $(GFIO_OBJS) $(LIBS) $(GFIO_LIBS) $(GTK_LDFLAGS) $(HDFSLIB
)
-t/genzipf: $(T_ZIPF_OBJS)
+t/
fio-
genzipf: $(T_ZIPF_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_ZIPF_OBJS) $(LIBS)
t/axmap: $(T_AXMAP_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_ZIPF_OBJS) $(LIBS)
t/axmap: $(T_AXMAP_OBJS)
@@
-345,15
+346,15
@@
t/lfsr-test: $(T_LFSR_TEST_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_LFSR_TEST_OBJS) $(LIBS)
ifeq ($(CONFIG_TARGET_OS), Linux)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_LFSR_TEST_OBJS) $(LIBS)
ifeq ($(CONFIG_TARGET_OS), Linux)
-t/btrace2fio: $(T_BTRACE_FIO_OBJS)
+t/
fio-
btrace2fio: $(T_BTRACE_FIO_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_BTRACE_FIO_OBJS) $(LIBS)
endif
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_BTRACE_FIO_OBJS) $(LIBS)
endif
-t/dedupe: $(T_DEDUPE_OBJS)
+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)
core.* core gfio FIO-VERSION-FILE *.d lib/*.d crc/*.d engines/*.d profiles/*.d t/*.d config-host.mak config-host.h exp/fixup-buggy-yacc-output y.tab.[ch] lex.y.c exp/*.[do]
+ @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
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