Various fixes/updates

[fio.git] / Makefile.mac

diff --git a/Makefile.mac b/Makefile.mac
index 952364ae2d9fc41f8327fe8a56b7f798d13694f7..f237aba157c1308f3ca7ec064330e47b2c8c9396 100644 (file)
--- a/Makefile.mac
+++ b/Makefile.mac
@@ -1,40 +1,21 @@
 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
+CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
+       $(DEBUGFLAGS)
+OPTFLAGS= -O2 -fno-omit-frame-pointer -g
+CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) -rdynamic
+LIBS   = -lpthread -lm -ldl
 PROGS  = fio
 SCRIPTS = fio_generate_plots
-OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \
-       eta.o verify.o memory.o io_u.o parse.o mutex.o options.o \
-       rbtree.o smalloc.o filehash.o helpers.o profile.o debug.o
 
-OBJS += lib/rand.o
-OBJS += lib/flist_sort.o
-OBJS += lib/num2str.o
-
-OBJS += crc/crc7.o
-OBJS += crc/crc16.o
-OBJS += crc/crc32.o
-OBJS += crc/crc32c.o
-OBJS += crc/crc32c-intel.o
-OBJS += crc/crc64.o
-OBJS += crc/sha1.o
-OBJS += crc/sha256.o
-OBJS += crc/sha512.o
-OBJS += crc/md5.o
-
-OBJS += engines/cpu.o
-OBJS += engines/mmap.o
-OBJS += engines/posixaio.o
-OBJS += engines/sync.o
-OBJS += engines/null.o
-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
+SOURCE = gettime.c fio.c ioengines.c init.c stat.c log.c time.c filesetup.c \
+       eta.c verify.c memory.c io_u.c parse.c mutex.c options.c rbtree.c \
+       smalloc.c filehash.c helpers.c profile.c debug.c lib/rand.c \
+       lib/flist_sort.c lib/num2str.c $(wildcard crc/*.c) engines/cpu.c \
+       engines/mmap.c engines/posixaio.c engines/sync.c engines/null.c \
+       engines/net.c
+       
+OBJS = $(SOURCE:.c=.o)
 
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
@@ -48,13 +29,14 @@ prefix = /usr/local
 bindir = $(prefix)/bin
 mandir = $(prefix)/man
 
-%.o: %.c
-       $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<
+.c.o:
+       $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $<
+       
 fio: $(OBJS)
-       $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm
+       $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS)
 
 depend:
-       $(QUIET_DEP)$(CC) -MM $(ALL_CFLAGS) $(SOURCE) 1> .depend
+       $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend
 
 $(PROGS): depend