[PATCH] Don't check status if ret < 0

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index 1ebad6af78ca7e0292096855b5f9ea8e09a0d97f..2b027dbdb42ce5a69c007358a995f5d47ad5befe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,30 @@
-CC     = gcc
-CFLAGS = -W -Wwrite-strings -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+#CC    = /opt/intel/cce/9.1.045/bin/icc
+CC     = gcc -W
+DEBUGFLAGS = -D_FORTIFY_SOURCE=2
+OPTFLAGS= -O2 -g
+CFLAGS = -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS)
 PROGS  = fio
 SCRIPTS = fio_generate_plots
-OBJS = fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o \
+OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o \
        filesetup.o eta.o verify.o memory.o io_u.o parse.o
 
-OBJS += engines/fio-engine-cpu.o
-OBJS += engines/fio-engine-libaio.o
-OBJS += engines/fio-engine-mmap.o
-OBJS += engines/fio-engine-posixaio.o
-OBJS += engines/fio-engine-sg.o
-OBJS += engines/fio-engine-splice.o
-OBJS += engines/fio-engine-sync.o
+OBJS += engines/cpu.o
+OBJS += engines/libaio.o
+OBJS += engines/mmap.o
+OBJS += engines/posixaio.o
+OBJS += engines/sg.o
+OBJS += engines/splice.o
+OBJS += engines/sync.o
+OBJS += engines/null.o
+OBJS += engines/net.o
+OBJS += engines/syslet-rw.o
 
 INSTALL = install
 prefix = /usr/local
 bindir = $(prefix)/bin
 libdir = $(prefix)/lib/fio
 
-FIO_INST_DIR = $(subst ','\'',$(prefix))
-
-CFLAGS += '-D_INST_PREFIX="$(FIO_INST_DIR)"'
-
-all: depend $(PROGS) $(SCRIPTS)
+all: $(PROGS) $(SCRIPTS)
 
 fio: $(OBJS)
        $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -lpthread -lm -ldl -laio -lrt
@@ -36,10 +38,11 @@ depend:
 cscope:
        @cscope -b
 
+$(PROGS): | depend
+
 install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
-       $(INSTALL) -m755 -d $(DESTDIR) $(libdir)
 
 ifneq ($(wildcard .depend),)
 include .depend