Various fixes/updates

[fio.git] / Makefile.Windows

diff --git a/Makefile.Windows b/Makefile.Windows
index 97a2813a82e4a26f5e234dfba78e3e750a87827d..f8e26979293fbe8836a616cd3a84cd4097b0e1dc 100644 (file)
--- a/Makefile.Windows
+++ b/Makefile.Windows
@@ -1,40 +1,21 @@
-CC     = gcc-3\r
-DEBUGFLAGS = -DFIO_INC_DEBUG\r
-OPTFLAGS=  -O2 -g $(EXTFLAGS)\r
-CFLAGS =  -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS) \r
+CC     = gcc\r
+DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG\r
+CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \\r
+       $(DEBUGFLAGS)\r
+OPTFLAGS= -O2 -fno-omit-frame-pointer -gstabs+\r
+CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS)\r
+LIBS   = -lpthread -lm -lrt\r
 PROGS  = fio\r
 SCRIPTS = fio_generate_plots\r
-OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \\r
-       eta.o verify.o memory.o io_u.o parse.o mutex.o options.o \\r
-       rbtree.o smalloc.o filehash.o helpers.o profile.o debug.o\r
 \r
-OBJS += lib/rand.o\r
-OBJS += lib/flist_sort.o\r
-OBJS += lib/num2str.o\r
+SOURCE = gettime.c fio.c ioengines.c init.c stat.c log.c time.c filesetup.c \\r
+       eta.c verify.c memory.c io_u.c parse.c mutex.c options.c rbtree.c \\r
+       smalloc.c filehash.c profile.c debug.c lib/rand.c \\r
+       lib/flist_sort.c lib/num2str.c $(wildcard crc/*.c) engines/cpu.c \\r
+       engines/mmap.c engines/sync.c engines/null.c engines/net.c \\r
+       engines/net.c engines/windowsaio.c\r
 \r
-OBJS += crc/crc7.o\r
-OBJS += crc/crc16.o\r
-OBJS += crc/crc32.o\r
-OBJS += crc/crc32c.o\r
-OBJS += crc/crc32c-intel.o\r
-OBJS += crc/crc64.o\r
-OBJS += crc/sha1.o\r
-OBJS += crc/sha256.o\r
-OBJS += crc/sha512.o\r
-OBJS += crc/md5.o\r
-\r
-OBJS += engines/cpu.o\r
-OBJS += engines/mmap.o\r
-OBJS += engines/posixaio.o\r
-OBJS += engines/sync.o\r
-OBJS += engines/null.o\r
-OBJS += engines/net.o\r
-OBJS += engines/windowsaio.o\r
-\r
-SOURCE = eta.c filehash.c filesetup.c fio.c gettime.c init.c ioengines.c \\r
-        io_u.c log.c memory.c mutex.c options.c parse.c rbtree.c smalloc.c \\r
-        stat.c parse.c crc/*.c engines/cpu.c engines/mmap.c \\r
-        engines/posixaio.c engines/sync.c engines/null.c engines/net.c engines/windowsaio.c\r
+OBJS = $(SOURCE:.c=.o)\r
 \r
 ifneq ($(findstring $(MAKEFLAGS),s),s)\r
 ifndef V\r
@@ -48,14 +29,15 @@ prefix = /usr/local
 bindir = $(prefix)/bin\r
 mandir = $(prefix)/man\r
 \r
-%.o: %.c\r
-       $(QUIET_CC)$(CC) -o $*.o -c $(CFLAGS) $<\r
+.c.o:\r
+       $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $<\r
+\r
 fio: $(OBJS)\r
        $(QUIET_CC)windres os/windows/version.rc -O coff -o version.o\r
-       $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -lrt version.o\r
+       $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS) version.o\r
 \r
 depend:\r
-       $(QUIET_DEP)$(CC) -MM $(ALL_CFLAGS) $(SOURCE) 1> .depend\r
+       $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend\r
 \r
 $(PROGS): depend\r
 \r