[PATCH] Link in known io engines

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index 80a0397502a91f464e30895db2c26c6913f42c6b..1ebad6af78ca7e0292096855b5f9ea8e09a0d97f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,17 @@
 CC     = gcc
 CC     = gcc

-CFLAGS = -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
 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 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
 
 INSTALL = install
 prefix = /usr/local


@@ -13,10 +23,9 @@ FIO_INST_DIR = $(subst ','\'',$(prefix))
 CFLAGS += '-D_INST_PREFIX="$(FIO_INST_DIR)"'
 
 all: depend $(PROGS) $(SCRIPTS)
 CFLAGS += '-D_INST_PREFIX="$(FIO_INST_DIR)"'
 
 all: depend $(PROGS) $(SCRIPTS)

-       $(MAKE) -C engines

 
 

-fio: fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o filesetup.o eta.o
-       $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -lpthread -laio -lm -lrt -ldl
+fio: $(OBJS)
+       $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -lpthread -lm -ldl -laio -lrt

 
 clean:
        -rm -f *.o .depend cscope.out $(PROGS) engines/*.o
 
 clean:
        -rm -f *.o .depend cscope.out $(PROGS) engines/*.o


@@ -31,7 +40,6 @@ install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
        $(INSTALL) -m755 -d $(DESTDIR) $(libdir)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
        $(INSTALL) -m755 -d $(DESTDIR) $(libdir)

-       $(INSTALL) engines/*.o $(libdir)

 
 ifneq ($(wildcard .depend),)
 include .depend
 
 ifneq ($(wildcard .depend),)
 include .depend