[PATCH] Improve dependency checking on builds

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index 684e8e04277b9fc23a9884ab70cdbc802e22c6d2..411dda06e41f05ede7416c36bbe34d9ad27e1699 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,35 @@
-CC     = gcc
-CFLAGS = -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 = 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
 
-all: depend $(PROGS) $(SCRIPTS)
+INSTALL = install
+prefix = /usr/local
+bindir = $(prefix)/bin
+libdir = $(prefix)/lib/fio
+
+all: $(PROGS) $(SCRIPTS)
 
-fio: fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
-       $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -lpthread -laio -lm -lrt
+fio: $(OBJS)
+       $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -lpthread -lm -ldl -laio -lrt
 
 clean:
-       -rm -f *.o .depend cscope.out $(PROGS)
+       -rm -f *.o .depend cscope.out $(PROGS) engines/*.o
 
 depend:
        @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
@@ -17,9 +37,7 @@ depend:
 cscope:
        @cscope -b
 
-INSTALL = install
-prefix = /usr/local
-bindir = $(prefix)/bin
+$(PROGS): | depend
 
 install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)