X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=63289e685cf8f357b00bddd0f9564d8ee46600f6;hb=ebb1415f729c123b8a13bcbd667bf4b4cc95b4d4;hp=111d5cd464a2be7d3527cec2e8ca07432d8b4d03;hpb=2f9ade3cb72218eb260f4f5e6914218bdcaa2bcc;p=fio.git

diff --git a/Makefile b/Makefile
index 111d5cd4..63289e68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,47 @@
-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
+OPTFLAGS= -O2 -g
+CFLAGS	= -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS) -rdynamic
 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
+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 mutex.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
+OBJS += engines/syslet-rw.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
+	-rm -f *.o .depend cscope.out $(PROGS) engines/*.o core.* core
 
 depend:
-	@$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
+	@$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c 1> .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