X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=Makefile;h=411dda06e41f05ede7416c36bbe34d9ad27e1699;hp=71b33c88c9c6adee0acc48f51a5f76af75b511c2;hb=a37bded35c66229ea830990ab313ca531fb94d4f;hpb=a94ea28b13429c38036546c36bcfd7355dc1441d;ds=sidebyside

diff --git a/Makefile b/Makefile
index 71b33c88..411dda06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,29 @@
-CC	= gcc
-CFLAGS	= -W -Wwrite-strings -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/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
+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
 
-all: depend $(PROGS) $(SCRIPTS)
+all: $(PROGS) $(SCRIPTS)
 
 fio: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) -lpthread -lm -ldl -laio -lrt
@@ -33,10 +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)
 
 ifneq ($(wildcard .depend),)
 include .depend