X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=Makefile;h=75bb758096278d704c47ca7fb6652b147d3c462d;hb=d9bb3b809d80cc3226d1c603e87fc90b6680320b;hp=2746ce7236691c0a5f5b0bc44fd7b2d46416e17a;hpb=c7b0818d2a9d1b8597256ea002d9cf9346ea97f3;p=fio.git

diff --git a/Makefile b/Makefile
index 2746ce72..75bb7580 100644
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,30 @@
-CC	= gcc
-CFLAGS	= -W -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
+OPTFLAGS= -O2 -g
+CFLAGS	= -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS)
 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/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)
-	@$(MAKE) -C engines
 
 fio: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -lpthread -lm -ldl
+	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -lpthread -lm -ldl -laio -lrt
 
 clean:
 	-rm -f *.o .depend cscope.out $(PROGS) engines/*.o
@@ -32,8 +38,6 @@ cscope:
 install: $(PROGS) $(SCRIPTS)
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
-	$(INSTALL) -m755 -d $(DESTDIR) $(libdir)
-	$(INSTALL) engines/*.o $(libdir)
 
 ifneq ($(wildcard .depend),)
 include .depend