Recent changes (master)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The following changes since commit 7496ea3e7fb234a1c92067301c028934c325daad:

  Allow override of CFLAGS (2013-01-31 18:37:41 +0100)

are available in the git repository at:
  git://git.kernel.dk/fio.git master

Jens Axboe (1):
      Makefile: fixup dependency problem for files in sub dirs

Neto, Antonio Jose Rodrigues (1):
      README: how to compile fio on Windows 64 bits

 .gitignore |    1 +
 Makefile   |   22 ++++++++++------------
 README     |   19 +++++++++++++++++++
 3 files changed, 30 insertions(+), 12 deletions(-)

---

Diff of recent changes:

diff --git a/.gitignore b/.gitignore
index 131f9a9..2457d65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 fio
 *.o
+*.d
 .depend
 cscope.out
diff --git a/Makefile b/Makefile
index 45b20e6..a2d671d 100644
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,7 @@ ifneq (,$(findstring CYGWIN,$(UNAME)))
 endif
 
 OBJS = $(SOURCE:.c=.o)
+-include $(OBJS:.o=.d)
 
 T_SMALLOC_OBJS = t/stest.o
 T_SMALLOC_OBJS += gettime.o mutex.o smalloc.o t/log.o
@@ -168,7 +169,7 @@ else
 mandir = $(prefix)/man
 endif
 
-all: .depend $(PROGS) $(SCRIPTS) FORCE
+all: $(PROGS) $(SCRIPTS) FORCE
 
 .PHONY: all install clean
 .PHONY: FORCE cscope
@@ -179,8 +180,14 @@ FIO-VERSION-FILE: FORCE
 
 override CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
 
-.c.o: .depend FORCE
+.c.o: FORCE
 	$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
+	@$(CC) -MM $(CFLAGS) $(CPPFLAGS) $*.c > $*.d
+	@mv -f $*.d $*.d.tmp
+	@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
+	@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+		sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
+	@rm -f $*.d.tmp
 
 init.o: FIO-VERSION-FILE
 	$(QUIET_CC)$(CC) -o init.o $(CFLAGS) $(CPPFLAGS) -c init.c
@@ -200,13 +207,8 @@ t/axmap: $(T_AXMAP_OBJS)
 fio: $(OBJS)
 	$(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
 
-.depend: $(SOURCE)
-	$(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend
-
-$(PROGS): .depend
-
 clean: FORCE
-	-rm -f .depend $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core FIO-VERSION-FILE config-host.mak cscope.out
+	-rm -f .depend $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core FIO-VERSION-FILE config-host.mak cscope.out *.d
 
 cscope:
 	@cscope -b -R
@@ -217,7 +219,3 @@ install: $(PROGS) $(SCRIPTS) FORCE
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -m 644 fio.1 $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -m 644 fio_generate_plots.1 $(DESTDIR)$(mandir)/man1
-
-ifneq ($(wildcard .depend),)
-include .depend
-endif
diff --git a/README b/README
index c43b795..97f1a28 100644
--- a/README
+++ b/README
@@ -114,6 +114,25 @@ build fio. To create an MSI installer package install WiX 3.6 from
 http://wix.sourceforge.net/releases/ and run dobuild.cmd from the
 os/windows directory.
 
+How to compile FIO on Windows 64 bits
+ 
+ 1. Install Cygwin - search for MinGW and install all MinGW packages.
+ 2. Download x86_64-w64-mingw32-gcc-4.7.2-release-win64_rubenvb.7z (http://sourceforge.net/projects/mingw-w64/files) - Select Toolchains targeting Win64 -> 
+    Personal Builds -> rubenv -> gcc-4.7-release
+ 3. Unzip the directory mingw64 to c:\ (c:\mingw64)
+ 4. Add to PATH - c:\mingw64\bin
+ 5. Copy c:\mingw64\bin\mingw32-make to c:\mingw64\bin\make.exe
+ 6. Download pthreads-20100604.zip (http://sourceforge.net/projects/mingw-w64/files) - Select External binary packages (Win64 hosted) -> pthreads
+ 7. Unzip pthreads-20100604.zip
+ 8. Unzip pthreads-w64.zip
+ 9. Copy pthreadGC2-w64.dll to c:\mingw64\bin
+10. Copy c:\mingw64\bin\pthreadGC2-w64.dll to c:\mingw64\bin\pthreadGC2.dll
+11. Open Cygwin Terminal
+12. Go to fio directory (source files)
+13. make clean
+14. ./configure
+15. make
+
 
 Command line
 ------------
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel]     [Linux SCSI]     [Linux IDE]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux