Merge branch 'winfio'

[fio.git] / Makefile.mac

diff --git a/Makefile.mac b/Makefile.mac
index 77e5f035082246c65c2c82ada3ff6840c70f58c0..3eb20be3f30fe986255d24df49a9431a5b8ad175 100644 (file)
--- a/Makefile.mac
+++ b/Makefile.mac
@@ -1,7 +1,7 @@
 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 -arch i386 -arch x86_64 -arch ppc
+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 \
@@ -10,6 +10,7 @@ OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \
 
 OBJS += lib/rand.o
 OBJS += lib/flist_sort.o
+OBJS += lib/num2str.o
 
 OBJS += crc/crc7.o
 OBJS += crc/crc16.o
@@ -32,8 +33,7 @@ OBJS += engines/net.o
 SOURCE = eta.c filehash.c filesetup.c fio.c gettime.c init.c ioengines.c \
         io_u.c log.c memory.c mutex.c options.c parse.c rbtree.c smalloc.c \
         stat.c parse.c crc/*.c engines/cpu.c engines/mmap.c \
-        engines/posixaio.c engines/sync.c engines/null.c engines/net.c \
-        *.h */*.h
+        engines/posixaio.c engines/sync.c engines/null.c engines/net.c
 
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V