[PATCH] Improve dependency checking on builds

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index 7951751d9f95c3c9b91b786de5a3b083fee28647..411dda06e41f05ede7416c36bbe34d9ad27e1699 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,32 @@
-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
+DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -fstack-protector
+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/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
+
 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
+all: $(PROGS) $(SCRIPTS)
 
 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
@@ -29,11 +37,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)
-       $(INSTALL) engines/*.o $(libdir)
 
 ifneq ($(wildcard .depend),)
 include .depend