parse: Fix two compiler warnings

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index 3ce606460114f0f85817d4efeb5577538f554d27..d73b944fa20f35efc252ca4216c66ea3cae8608b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,19 +4,18 @@ endif
 
 VPATH := $(SRCDIR)
 
-ifneq ($(wildcard config-host.mak),)
-all:
-include config-host.mak
-config-host-mak: configure
-       @echo $@ is out-of-date, running configure
-       @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
-else
-config-host.mak:
+all: fio
+
+config-host.mak: configure
+       @if [ ! -e "$@" ]; then                                 \
+         echo "Running configure ...";                         \
+         ./configure;                                          \
+       else                                                    \
+         echo "$@ is out-of-date, running configure";          \
+         sed -n "/.*Configured with/s/[^:]*: //p" "$@" | sh;   \
+       fi
+
 ifneq ($(MAKECMDGOALS),clean)
-       @echo "Running configure for you..."
-       @./configure
-endif
-all:
 include config-host.mak
 endif
 
@@ -31,6 +30,9 @@ SCRIPTS = $(addprefix $(SRCDIR)/,tools/fio_generate_plots tools/plot/fio2gnuplot
 ifndef CONFIG_FIO_NO_OPT
   CFLAGS += -O3 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
 endif
+ifdef CONFIG_BUILD_NATIVE
+  CFLAGS += -march=native
+endif
 
 ifdef CONFIG_GFIO
   PROGS += gfio
@@ -95,6 +97,9 @@ endif
 ifdef CONFIG_WINDOWSAIO
   SOURCE += engines/windowsaio.c
 endif
+ifdef CONFIG_RADOS
+  SOURCE += engines/rados.c
+endif
 ifdef CONFIG_RBD
   SOURCE += engines/rbd.c
 endif