Allow override of CFLAGS

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index 96819c81378d1a2861121a15cfd3ecac7f71ca0d..45b20e61bcc77a78c981417f91b2df9fdc21b8a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
-CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
-       $(DEBUGFLAGS)
+CPPFLAGS= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(DEBUGFLAGS)
 OPTFLAGS= -O3 -g -ffast-math $(EXTFLAGS)
 CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS)
 LIBS   = -lm $(EXTLIBS)
@@ -29,25 +28,25 @@ 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
+               helpers.c lib/flist_sort.c lib/hweight.c lib/getrusage.c \
+               idletime.c
 
+ifdef CONFIG_64BIT_LLP64
+  CFLAGS += -DBITS_PER_LONG=32
+endif
 ifdef CONFIG_64BIT
   CFLAGS += -DBITS_PER_LONG=64
 endif
 ifdef CONFIG_32BIT
   CFLAGS += -DBITS_PER_LONG=32
 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
@@ -57,77 +56,29 @@ ifdef CONFIG_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
 
 ifeq ($(UNAME), Linux)
   SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
@@ -167,7 +118,7 @@ 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
@@ -226,13 +177,13 @@ 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) $<
+       $(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
 
 init.o: FIO-VERSION-FILE
-       $(QUIET_CC)$(CC) -o init.o -c $(CFLAGS) $(CPPFLAGS) -c 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)
@@ -255,7 +206,7 @@ fio: $(OBJS)
 $(PROGS): .depend
 
 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
 
 cscope:
        @cscope -b -R