X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=Makefile;h=11bb17e7387b3b1bf54d36fc455596370d4a4a4e;hp=e0e323de530940d4983f3f89388cddeb7319a9c8;hb=bac39e0e8807a1d52863ad8304e67221df2bc63b;hpb=d24c33a479fcd68debad128da057814495f65e20

diff --git a/Makefile b/Makefile
index e0e323de..11bb17e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-#CC	= /opt/intel/cce/9.1.045/bin/icc
 CC	= gcc
 DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
 OPTFLAGS= -O2 -g $(EXTFLAGS)
@@ -6,12 +5,13 @@ CFLAGS	= -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_
 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 options.o rbtree.o \
-	diskutil.o fifo.o blktrace.o smalloc.o
+	eta.o verify.o memory.o io_u.o parse.o mutex.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/crc32c.o
 OBJS += crc/crc64.o
 OBJS += crc/sha256.o
 OBJS += crc/sha512.o
@@ -32,8 +32,7 @@ OBJS += engines/guasi.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
 
@@ -47,19 +46,19 @@ mandir = $(prefix)/man
 fio: $(OBJS)
 	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
 
-all: $(PROGS) $(SCRIPTS)
+depend:
+	$(QUIET_DEP)$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c crc/*.c 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)
+
+clean:
+	-rm -f .depend cscope.out $(OBJS) $(PROGS) core.* core
 
 cscope:
 	@cscope -b
 
-$(PROGS): depend
-
 install: $(PROGS) $(SCRIPTS)
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)