X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=Makefile;h=ccfa802bfb9bfc74158b3fe5ffa4171ec1297e07;hp=61e2163fb604f254b1e84e846e8ee8a1e49182fd;hb=4d002569dc503474a53e824e3f72b10a09c9a2b5;hpb=a6204b6818e0b5bf7c7aae0bd8fd840f71e2c4a3

diff --git a/Makefile b/Makefile
index 61e2163f..ccfa802b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CC	= gcc
+CC	?= gcc
 DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
 CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
 	$(DEBUGFLAGS)
@@ -14,13 +14,15 @@ SOURCE := gettime.c fio.c ioengines.c init.c stat.c log.c time.c filesetup.c \
 		rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \
 		lib/num2str.c lib/ieee754.c $(wildcard crc/*.c) engines/cpu.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
+		memalign.c server.c client.c iolog.c backend.c libfio.c flow.c \
+		json.c
 
 ifeq ($(UNAME), Linux)
   SOURCE += diskutil.c fifo.c blktrace.c helpers.c cgroup.c trim.c \
 		engines/libaio.c engines/posixaio.c engines/sg.c \
 		engines/splice.c engines/syslet-rw.c engines/guasi.c \
-		engines/binject.c engines/rdma.c profiles/tiobench.c
+		engines/binject.c engines/rdma.c profiles/tiobench.c \
+		engines/fusion-aw.c engines/falloc.c engines/e4defrag.c
   LIBS += -lpthread -ldl -lrt -laio
   LDFLAGS += -rdynamic
 endif
@@ -61,6 +63,7 @@ ifneq (,$(findstring CYGWIN,$(UNAME)))
   LIBS	 += -lpthread -lpsapi -lws2_32
   CFLAGS += -DPSAPI_VERSION=1 -Ios/windows/posix/include -Wno-format
   CC	  = x86_64-w64-mingw32-gcc
+  #CC	  = i686-w64-mingw32-gcc
 endif
 
 OBJS = $(SOURCE:.c=.o)
@@ -99,7 +102,7 @@ all: .depend $(PROGS) $(SCRIPTS) FORCE
 .PHONY: FORCE cscope
 
 FIO-VERSION-FILE: FORCE
-	@$(SHELL_PATH) ./FIO-VERSION-GEN
+	@$(SHELL) ./FIO-VERSION-GEN
 -include FIO-VERSION-FILE
 
 CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'