X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=Makefile;h=bb345ed9899bf7ca44b8ffa646e3e026ffe213ff;hb=033ace1e7965ebf215f6fba2102de5b716ebfede;hp=84988f8acc933b6783db1a4ff03240929bc5c0b5;hpb=997843cbd55f34f7f48f2ebc108500d97e37474c;p=fio.git

diff --git a/Makefile b/Makefile
index 84988f8a..bb345ed9 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,8 @@ SOURCE := gettime.c fio.c ioengines.c init.c stat.c log.c time.c filesetup.c \
 		engines/mmap.c engines/sync.c engines/null.c engines/net.c \
 		memalign.c server.c client.c iolog.c backend.c libfio.c flow.c \
 		json.c lib/zipf.c lib/axmap.c lib/lfsr.c gettime-thread.c \
-		helpers.c lib/flist_sort.c lib/hweight.c lib/getrusage.c
+		helpers.c lib/flist_sort.c lib/hweight.c lib/getrusage.c \
+		idletime.c
 
 ifdef CONFIG_64BIT_LLP64
   CFLAGS += -DBITS_PER_LONG=32
@@ -39,112 +40,45 @@ endif
 ifdef CONFIG_32BIT
   CFLAGS += -DBITS_PER_LONG=32
 endif
-ifdef CONFIG_BIG_ENDIAN
-  CFLAGS += -DCONFIG_BIG_ENDIAN
-endif
-ifdef CONFIG_LITTLE_ENDIAN
-  CFLAGS += -DCONFIG_LITTLE_ENDIAN
-endif
 ifdef CONFIG_LIBAIO
-  CFLAGS += -DCONFIG_LIBAIO
   SOURCE += engines/libaio.c
 endif
 ifdef CONFIG_RDMA
-  CFLAGS += -DCONFIG_RDMA
   SOURCE += engines/rdma.c
 endif
 ifdef CONFIG_POSIXAIO
-  CFLAGS += -DCONFIG_POSIXAIO
   SOURCE += engines/posixaio.c
 endif
 ifdef CONFIG_LINUX_FALLOCATE
   SOURCE += engines/falloc.c
 endif
 ifdef CONFIG_LINUX_EXT4_MOVE_EXTENT
-  CFLAGS += -DCONFIG_LINUX_EXT4_MOVE_EXTENT
   SOURCE += engines/e4defrag.c
 endif
 ifdef CONFIG_LINUX_SPLICE
-  CFLAGS += -DCONFIG_LINUX_SPLICE
   SOURCE += engines/splice.c
 endif
 ifdef CONFIG_GUASI
-  CFLAGS += -DCONFIG_GUASI
   SOURCE += engines/guasi.c
 endif
 ifdef CONFIG_FUSION_AW
-  CFLAGS += -DCONFIG_FUSION_AW
   SOURCE += engines/fusion-aw.c
 endif
 ifdef CONFIG_SOLARISAIO
-  CFLAGS += -DCONFIG_SOLARISAIO
   SOURCE += engines/solarisaio.c
 endif
-
+ifdef CONFIG_WINDOWSAIO
+  SOURCE += engines/windowsaio.c
+endif
 ifndef CONFIG_STRSEP
-  CFLAGS += -DCONFIG_STRSEP
   SOURCE += lib/strsep.c
 endif
 ifndef CONFIG_GETOPT_LONG_ONLY
-  CFLAGS += -DCONFIG_GETOPT_LONG_ONLY
   SOURCE += lib/getopt_long.c
 endif
-
 ifndef CONFIG_INET_ATON
-  CFLAGS += -DCONFIG_INET_ATON
   SOURCE += lib/inet_aton.c
 endif
-ifdef CONFIG_CLOCK_GETTIME
-  CFLAGS += -DCONFIG_CLOCK_GETTIME
-endif
-ifdef CONFIG_POSIXAIO_FSYNC
-  CFLAGS += -DCONFIG_POSIXAIO_FSYNC
-endif
-ifdef CONFIG_FADVISE
-  CFLAGS += -DCONFIG_FADVISE
-endif
-ifdef CONFIG_CLOCK_MONOTONIC
-  CFLAGS += -DCONFIG_CLOCK_MONOTONIC
-endif
-ifdef CONFIG_CLOCK_MONOTONIC_PRECISE
-  CFLAGS += -DCONFIG_CLOCK_MONOTONIC_PRECISE
-endif
-ifdef CONFIG_GETTIMEOFDAY
-  CFLAGS += -DCONFIG_GETTIMEOFDAY
-endif
-ifdef CONFIG_SOCKLEN_T
-  CFLAGS += -DCONFIG_SOCKLEN_T
-endif
-ifdef CONFIG_SFAA
-  CFLAGS += -DCONFIG_SFAA
-endif
-ifdef CONFIG_FDATASYNC
-  CFLAGS += -DCONFIG_FDATASYNC
-endif
-ifdef CONFIG_3ARG_AFFINITY
-  CFLAGS += -DCONFIG_3ARG_AFFINITY
-endif
-ifdef CONFIG_2ARG_AFFINITY
-  CFLAGS += -DCONFIG_2ARG_AFFINITY
-endif
-ifdef CONFIG_SYNC_FILE_RANGE
-  CFLAGS += -DCONFIG_SYNC_FILE_RANGE
-endif
-ifdef CONFIG_LIBNUMA
-  CFLAGS += -DCONFIG_LIBNUMA
-endif
-ifdef CONFIG_TLS_THREAD
-  CFLAGS += -DCONFIG_TLS_THREAD
-endif
-ifdef CONFIG_POSIX_FALLOCATE
-  CFLAGS += -DCONFIG_POSIX_FALLOCATE
-endif
-ifdef CONFIG_LINUX_FALLOCATE
-  CFLAGS += -DCONFIG_LINUX_FALLOCATE
-endif
-ifdef CONFIG_RUSAGE_THREAD
-  CFLAGS += -DCONFIG_RUSAGE_THREAD
-endif
 
 ifeq ($(UNAME), Linux)
   SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
@@ -156,7 +90,6 @@ ifeq ($(UNAME), Android)
   SOURCE += diskutil.c fifo.c blktrace.c trim.c profiles/tiobench.c
   LIBS += -ldl
   LDFLAGS += -rdynamic
-  CPPFLAGS += -DFIO_NO_HAVE_SHM_H
 endif
 ifeq ($(UNAME), SunOS)
   LIBS	 += -lpthread -ldl -laio -lrt -lnsl -lsocket
@@ -184,12 +117,13 @@ ifeq ($(UNAME), Darwin)
 endif
 ifneq (,$(findstring CYGWIN,$(UNAME)))
   SOURCE := $(filter-out engines/mmap.c,$(SOURCE))
-  SOURCE += engines/windowsaio.c os/windows/posix.c
+  SOURCE += os/windows/posix.c
   LIBS	 += -lpthread -lpsapi -lws2_32
   CFLAGS += -DPSAPI_VERSION=1 -Ios/windows/posix/include -Wno-format
 endif
 
 OBJS = $(SOURCE:.c=.o)
+-include $(OBJS:.o=.d)
 
 T_SMALLOC_OBJS = t/stest.o
 T_SMALLOC_OBJS += gettime.o mutex.o smalloc.o t/log.o
@@ -220,6 +154,7 @@ T_PROGS += $(T_AXMAP_PROGS)
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
 	QUIET_CC	= @echo '   ' CC $@;
+	QUIET_LINK	= @echo '   ' LINK $@;
 	QUIET_DEP	= @echo '   ' DEP $@;
 endif
 endif
@@ -234,7 +169,7 @@ else
 mandir = $(prefix)/man
 endif
 
-all: .depend $(PROGS) $(SCRIPTS) FORCE
+all: $(PROGS) $(SCRIPTS) FORCE
 
 .PHONY: all install clean
 .PHONY: FORCE cscope
@@ -243,36 +178,37 @@ FIO-VERSION-FILE: FORCE
 	@$(SHELL) ./FIO-VERSION-GEN
 -include FIO-VERSION-FILE
 
-CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
+override CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
 
-.c.o: .depend FORCE
-	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $<
+.c.o: FORCE FIO-VERSION-FILE
+	$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
+	@$(CC) -MM $(CFLAGS) $(CPPFLAGS) $*.c > $*.d
+	@mv -f $*.d $*.d.tmp
+	@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
+	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+		sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
+	@rm -f $*.d.tmp
 
-init.o: FIO-VERSION-FILE
-	$(QUIET_CC)$(CC) -o init.o -c $(CFLAGS) $(CPPFLAGS) -c init.c
+init.o: FIO-VERSION-FILE init.c
+	$(QUIET_CC)$(CC) -o init.o $(CFLAGS) $(CPPFLAGS) -c init.c
 
 t/stest: $(T_SMALLOC_OBJS)
-	$(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_SMALLOC_OBJS) $(LIBS) $(LDFLAGS)
+	$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_SMALLOC_OBJS) $(LIBS) $(LDFLAGS)
 
 t/ieee754: $(T_IEEE_OBJS)
-	$(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_IEEE_OBJS) $(LIBS) $(LDFLAGS)
+	$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_IEEE_OBJS) $(LIBS) $(LDFLAGS)
 
 t/genzipf: $(T_ZIPF_OBJS)
-	$(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_ZIPF_OBJS) $(LIBS) $(LDFLAGS)
+	$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_ZIPF_OBJS) $(LIBS) $(LDFLAGS)
 
 t/axmap: $(T_AXMAP_OBJS)
-	$(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_AXMAP_OBJS) $(LIBS) $(LDFLAGS)
+	$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_AXMAP_OBJS) $(LIBS) $(LDFLAGS)
 
 fio: $(OBJS)
-	$(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
-
-.depend: $(SOURCE)
-	$(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend
-
-$(PROGS): .depend
+	$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
 
 clean: FORCE
-	-rm -f .depend $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core FIO-VERSION-FILE config-host.mak config-host.ld cscope.out
+	-rm -f .depend $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core FIO-VERSION-FILE config-host.mak cscope.out *.d
 
 cscope:
 	@cscope -b -R
@@ -283,7 +219,3 @@ install: $(PROGS) $(SCRIPTS) FORCE
 	$(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
-endif