Clear num_opts early

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index bf2e5c00ed86fc36a1f5a161243f3379f4a3bbc9..cd061adb4642d5ade6e1e827c18f31516e5b7fd0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,20 @@
-#CC    = /opt/intel/cce/9.1.045/bin/icc
-CC     = gcc -W
-DEBUGFLAGS = -D_FORTIFY_SOURCE=2
+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
 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 \
-       crc16.o crc7.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
+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 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
@@ -21,29 +28,41 @@ OBJS += engines/net.o
 OBJS += engines/syslet-rw.o
 OBJS += engines/guasi.o
 
+ifneq ($(findstring $(MAKEFLAGS),s),s)
+ifndef V
+       QUIET_CC        = @echo '   ' CC $@;
+       QUIET_DEP       = @echo '   ' DEP $@;
+endif
+endif
+
 INSTALL = install
 prefix = /usr/local
 bindir = $(prefix)/bin
+mandir = $(prefix)/man
 
-all: $(PROGS) $(SCRIPTS)
-
+%.o: %.c
+       $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
 fio: $(OBJS)
-       $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
-
-clean:
-       -rm -f *.o .depend cscope.out $(PROGS) engines/*.o core.* core
+       $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
 
 depend:
-       @$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c 1> .depend
+       $(QUIET_DEP)$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c crc/*.[ch] 1> .depend
+
+$(PROGS): 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)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -m 644 fio.1 $(DESTDIR)$(mandir)/man1
 
 ifneq ($(wildcard .depend),)
 include .depend