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

diff --git a/Makefile b/Makefile
index 312f8ded..1ebad6af 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,17 @@
 CC	= gcc
-CFLAGS	= -W -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS	= -W -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 \
-	filesetup.o eta.o verify.o memory.o io_u.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
 
 INSTALL = install
 prefix = /usr/local
@@ -15,10 +23,9 @@ 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
@@ -33,7 +40,6 @@ 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