X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=Makefile;h=b7a25f51b454d7a4e7de0846035b0012c3fafea1;hp=2acc918d03e8a81e36e6e17e2fabfa4e9048fd90;hb=73af677de4a8cfc3e647887c68b1838d625c4de7;hpb=d60e92d13e969b08dcdad940499ef081b07ac6f7

diff --git a/Makefile b/Makefile
index 2acc918d..b7a25f51 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
-#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 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
+	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
@@ -29,27 +28,36 @@ 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
+	$(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
+
+depend:
+	$(QUIET_DEP)$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c crc/*.[ch] 1> .depend
+
+$(PROGS): depend
+
+all: depend $(PROGS) $(SCRIPTS)
 
 clean:
 	-rm -f *.o .depend cscope.out $(PROGS) engines/*.o crc/*.o core.* core
 
-depend:
-	@$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c crc/*.[ch] 1> .depend
-
 cscope:
 	@cscope -b
 
-$(PROGS): depend
-
 install: $(PROGS) $(SCRIPTS)
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)