X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=Makefile;h=19943dbc4fa0b047c5a4f3c4fb5082dd1d731fef;hp=1380c02c9b26bab51c673fbddd7483f15b34a567;hb=refs%2Ftags%2Ffio-1.50-rc4;hpb=380065aa652b87093d6bbd240e70db30bd6f193d

diff --git a/Makefile b/Makefile
index 1380c02c..19943dbc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,28 @@
-#CC	= /opt/intel/cce/9.1.045/bin/icc
 CC	= gcc
 DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
-OPTFLAGS= -O2 -g $(EXTFLAGS)
-CFLAGS	= -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS) -rdynamic
+CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+	$(DEBUGFLAGS)
+OPTFLAGS= -O2 -fno-omit-frame-pointer -g $(EXTFLAGS)
+CFLAGS	= -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) -rdynamic
+LIBS	= -lpthread -lm -ldl -lrt -laio
 PROGS	= fio
 SCRIPTS = fio_generate_plots
-OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \
-	eta.o verify.o memory.o io_u.o parse.o mutex.o sem.o options.o \
-	rbtree.o diskutil.o fifo.o blktrace.o smalloc.o filehash.o
-
-OBJS += crc/crc7.o
-OBJS += crc/crc16.o
-OBJS += crc/crc32.o
-OBJS += crc/crc64.o
-OBJS += crc/sha256.o
-OBJS += crc/sha512.o
-OBJS += crc/md5.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
-OBJS += engines/guasi.o
+	
+SOURCE = gettime.c fio.c ioengines.c init.c stat.c log.c time.c filesetup.c \
+	eta.c verify.c memory.c io_u.c parse.c mutex.c options.c rbtree.c \
+	diskutil.c fifo.c blktrace.c smalloc.c filehash.c helpers.c \
+	cgroup.c profile.c debug.c trim.c lib/rand.c lib/flist_sort.c \
+	lib/num2str.c $(wildcard crc/*.c) engines/cpu.c engines/libaio.c \
+	engines/mmap.c engines/posixaio.c engines/sg.c engines/splice.c \
+	engines/sync.c engines/null.c engines/net.c engines/syslet-rw.c \
+	engines/guasi.c engines/binject.c profiles/tiobench.c
+	
+OBJS = $(SOURCE:.c=.o)
 
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
 	QUIET_CC	= @echo '   ' CC $@;
-	QUIET_AR	= @echo '   ' AR $@;
-	QUIET_LINK	= @echo '   ' LINK $@;
+	QUIET_DEP	= @echo '   ' DEP $@;
 endif
 endif
 
@@ -42,29 +31,31 @@ prefix = /usr/local
 bindir = $(prefix)/bin
 mandir = $(prefix)/man
 
-%.o: %.c
-	$(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
+.c.o:
+	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $<
+	
 fio: $(OBJS)
-	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
+	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS)
 
-all: $(PROGS) $(SCRIPTS)
+depend:
+	$(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend
 
-clean:
-	-rm -f *.o .depend cscope.out $(PROGS) engines/*.o crc/*.o core.* core
+$(PROGS): depend
 
-depend:
-	@$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c crc/*.[ch] 1> .depend
+all: depend $(PROGS) $(SCRIPTS)
 
-cscope:
-	@cscope -b
+clean:
+	-rm -f .depend $(OBJS) $(PROGS) core.* core
 
-$(PROGS): depend
+cscope:
+	@cscope -b -R
 
 install: $(PROGS) $(SCRIPTS)
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -m 644 fio.1 $(DESTDIR)$(mandir)/man1
+	$(INSTALL) -m 644 fio_generate_plots.1 $(DESTDIR)$(mandir)/man1
 
 ifneq ($(wildcard .depend),)
 include .depend