X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=Makefile;h=832ed6db536e0b804d8da4b88d654b699bdab0c6;hp=1ebad6af78ca7e0292096855b5f9ea8e09a0d97f;hb=d0bdaf49eb3f4faa941d02274f2bd875a187e7d7;hpb=5f350952eff89948bfbf1eb6ac4d3d08a9109581

diff --git a/Makefile b/Makefile
index 1ebad6af..832ed6db 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-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
+CFLAGS	= -Wwrite-strings -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 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
@@ -12,16 +13,13 @@ 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/fio-engine-null.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)
 
 fio: $(OBJS)