From 0e655dd09a89a0d05e2d3dc5c978283277939e08 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 27 Jan 2011 22:23:48 +0100 Subject: [PATCH] Revert "Unify makefiles" This reverts commit 7d130d8d2a5638ca91dc81ec085acef4d3c3ad08. It requires make 3.81, and some popular distros are still using make 3.80. Signed-off-by: Jens Axboe --- Makefile | 53 +++++++++-------------------------------- Makefile.FreeBSD | 60 +++++++++++++++++++++++++++++++++++++++++++++++ Makefile.NetBSD | 59 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile.Windows | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.aix | 59 ++++++++++++++++++++++++++++++++++++++++++++++ Makefile.mac | 60 +++++++++++++++++++++++++++++++++++++++++++++++ Makefile.solaris | 60 +++++++++++++++++++++++++++++++++++++++++++++++ README | 15 ++++++++---- 8 files changed, 381 insertions(+), 46 deletions(-) create mode 100644 Makefile.FreeBSD create mode 100644 Makefile.NetBSD create mode 100644 Makefile.Windows create mode 100644 Makefile.aix create mode 100644 Makefile.mac create mode 100644 Makefile.solaris diff --git a/Makefile b/Makefile index df58489d..19943dbc 100644 --- a/Makefile +++ b/Makefile @@ -3,51 +3,20 @@ DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ $(DEBUGFLAGS) OPTFLAGS= -O2 -fno-omit-frame-pointer -g $(EXTFLAGS) -CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) -LIBS = -lm +CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) -rdynamic +LIBS = -lpthread -lm -ldl -lrt -laio PROGS = fio SCRIPTS = fio_generate_plots -UNAME := $(shell uname) - + 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 profile.c debug.c lib/rand.c \ - lib/num2str.c $(wildcard crc/*.c) engines/cpu.c \ - engines/mmap.c engines/sync.c engines/null.c engines/net.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 profiles/tiobench.c - LIBS += -lpthread -ldl -lrt -laio - CFLAGS += -rdynamic -else ifeq ($(UNAME), SunOS) - SOURCE += fifo.c lib/strsep.c helpers.c solaris.c engines/posixaio.c \ - engines/solarisaio.c - LIBS += -lpthread -ldl -laio -lrt -lnsl -lsocket - CPPFLAGS += -D__EXTENSIONS__ -else ifeq ($(UNAME), FreeBSD) - SOURCE += helpers.c engines/posixaio.c - LIBS += -lpthread -lrt - CFLAGS += -rdynamic -else ifeq ($(UNAME), NetBSD) - SOURCE += helpers.c engines/posixaio.c - LIBS += -lpthread -lrt - CFLAGS += -rdynamic -else ifeq ($(UNAME), AIX) - SOURCE += fifo.c helpers.c lib/getopt_long.c engines/posixaio.c - LIBS += -lpthread -ldl -lrt - CFLAGS += -rdynamic - CPPFLAGS += -D_LARGE_FILES -D__ppc__ -else ifeq ($(UNAME), Darwin) - SOURCE += helpers.c engines/posixaio.c - LIBS += -lpthread -ldl -else ifneq (,$(findstring CYGWIN,$(UNAME))) - SOURCE += engines/windowsaio.c - LIBS += -lpthread -lrt -endif - + eta.c verify.c memory.c io_u.c parse.c mutex.c options.c rbtree.c \ + diskutil.c fifo.c blktrace.c smalloc.c filehash.c helpers.c \ + cgroup.c profile.c debug.c trim.c lib/rand.c lib/flist_sort.c \ + lib/num2str.c $(wildcard crc/*.c) engines/cpu.c engines/libaio.c \ + engines/mmap.c engines/posixaio.c engines/sg.c engines/splice.c \ + engines/sync.c engines/null.c engines/net.c engines/syslet-rw.c \ + engines/guasi.c engines/binject.c profiles/tiobench.c + OBJS = $(SOURCE:.c=.o) ifneq ($(findstring $(MAKEFLAGS),s),s) diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD new file mode 100644 index 00000000..537f7706 --- /dev/null +++ b/Makefile.FreeBSD @@ -0,0 +1,60 @@ +CC = gcc +DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG +CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + $(DEBUGFLAGS) +OPTFLAGS= -O2 -fno-omit-frame-pointer -g $(EXTFLAGS) +CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) -rdynamic +LIBS = -lpthread -lm -lrt +PROGS = fio +SCRIPTS = fio_generate_plots + +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 + QUIET_CC = @echo ' ' CC $@; + QUIET_DEP = @echo ' ' DEP $@; +endif +endif + +INSTALL = install +prefix = /usr/local +bindir = $(prefix)/bin +mandir = $(prefix)/man + +.c.o: + $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $< + +fio: $(OBJS) + $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS) + +depend: + $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend + +$(PROGS): depend + +all: depend $(PROGS) $(SCRIPTS) + +clean: + -rm -f .depend cscope.out $(OBJS) $(PROGS) core.* core + +cscope: + @cscope -b + +install: $(PROGS) $(SCRIPTS) + $(INSTALL) -m755 -d $(DESTDIR)$(bindir) + $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir) + $(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/Makefile.NetBSD b/Makefile.NetBSD new file mode 100644 index 00000000..cefc34ea --- /dev/null +++ b/Makefile.NetBSD @@ -0,0 +1,59 @@ +CC = gcc +DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG +CPPFLAGS= -D_GNU_SOURCE $(DEBUGFLAGS) +OPTFLAGS= -O2 -fno-omit-frame-pointer -g $(EXTFLAGS) +CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) -rdynamic +LIBS = -lpthread -lm -lrt +PROGS = fio +SCRIPTS = fio_generate_plots + +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 + QUIET_CC = @echo ' ' CC $@; + QUIET_DEP = @echo ' ' DEP $@; +endif +endif + +INSTALL = install +prefix = /usr/local +bindir = $(prefix)/bin +mandir = $(prefix)/man + +.c.o: + $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $< + +fio: $(OBJS) + $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS) + +depend: + $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend + +$(PROGS): depend + +all: depend $(PROGS) $(SCRIPTS) + +clean: + -rm -f .depend cscope.out $(OBJS) $(PROGS) core.* core + +cscope: + @cscope -b + +install: $(PROGS) $(SCRIPTS) + $(INSTALL) -m755 -d $(DESTDIR)$(bindir) + $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir) + $(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/Makefile.Windows b/Makefile.Windows new file mode 100644 index 00000000..3313c041 --- /dev/null +++ b/Makefile.Windows @@ -0,0 +1,61 @@ +CC = gcc +DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG +CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + $(DEBUGFLAGS) +OPTFLAGS= -O2 -fno-omit-frame-pointer -gstabs+ $(EXTFLAGS) +CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) +LIBS = -lpthread -lm -lrt +PROGS = fio +SCRIPTS = fio_generate_plots + +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 profile.c debug.c lib/rand.c \ + lib/flist_sort.c lib/num2str.c $(wildcard crc/*.c) engines/cpu.c \ + engines/mmap.c engines/sync.c engines/null.c engines/net.c \ + engines/net.c engines/windowsaio.c + +OBJS = $(SOURCE:.c=.o) + +ifneq ($(findstring $(MAKEFLAGS),s),s) +ifndef V + QUIET_CC = @echo ' ' CC $@; + QUIET_DEP = @echo ' ' DEP $@; +endif +endif + +INSTALL = install +prefix = /usr/local +bindir = $(prefix)/bin +mandir = $(prefix)/man + +.c.o: + $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $< + +fio: $(OBJS) + $(QUIET_CC)windres os/windows/version.rc -O coff -o version.o + $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS) version.o + +depend: + $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend + +$(PROGS): depend + +all: depend $(PROGS) $(SCRIPTS) + +clean: + -rm -f .depend cscope.out $(OBJS) $(PROGS) version.o core.* core + +cscope: + @cscope -b + +install: $(PROGS) $(SCRIPTS) + $(INSTALL) -m755 -d $(DESTDIR)$(bindir) + $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir) + $(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/Makefile.aix b/Makefile.aix new file mode 100644 index 00000000..174ffee7 --- /dev/null +++ b/Makefile.aix @@ -0,0 +1,59 @@ +CC = gcc +DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG +CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + -D_LARGE_FILES -D__ppc__ $(DEBUGFLAGS) +OPTFLAGS= -O2 -fno-omit-frame-pointer -g $(EXTFLAGS) +CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) -rdynamic +LIBS = -lpthread -lm -ldl -lrt +PROGS = fio +SCRIPTS = fio_generate_plots + +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 \ + fifo.c smalloc.c filehash.c helpers.c profile.c debug.c lib/rand.c \ + lib/getopt_long.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 profiles/tiobench.c + +OBJS = $(SOURCE:.c=.o) + +ifneq ($(findstring $(MAKEFLAGS),s),s) +ifndef V + QUIET_CC = @echo ' ' CC $@; + QUIET_DEP = @echo ' ' DEP $@; +endif +endif + +INSTALL = installbsd -c +prefix = /usr/local +bindir = $(prefix)/bin +mandir = $(prefix)/man + +.c.o: + $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $< + +fio: $(OBJS) + $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS) + +depend: + $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend + +$(PROGS): depend + +all: depend $(PROGS) $(SCRIPTS) + +clean: + -rm -f .depend cscope.out $(OBJS) $(PROGS) core.* core + +cscope: + @cscope -b + +install: $(PROGS) $(SCRIPTS) + mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 + $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir) + $(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/Makefile.mac b/Makefile.mac new file mode 100644 index 00000000..6efce20d --- /dev/null +++ b/Makefile.mac @@ -0,0 +1,60 @@ +CC = gcc +DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG +CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + $(DEBUGFLAGS) +OPTFLAGS= -O2 -fno-omit-frame-pointer -g $(EXTFLAGS) +CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) -rdynamic +LIBS = -lpthread -lm -ldl +PROGS = fio +SCRIPTS = fio_generate_plots + +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 + QUIET_CC = @echo ' ' CC $@; + QUIET_DEP = @echo ' ' DEP $@; +endif +endif + +INSTALL = install +prefix = /usr/local +bindir = $(prefix)/bin +mandir = $(prefix)/man + +.c.o: + $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $< + +fio: $(OBJS) + $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS) + +depend: + $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend + +$(PROGS): depend + +all: depend $(PROGS) $(SCRIPTS) + +clean: + -rm -f .depend cscope.out $(OBJS) $(PROGS) core.* core + +cscope: + @cscope -b + +install: $(PROGS) $(SCRIPTS) + $(INSTALL) -m755 -d $(DESTDIR)$(bindir) + $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir) + $(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/Makefile.solaris b/Makefile.solaris new file mode 100644 index 00000000..97a3ae50 --- /dev/null +++ b/Makefile.solaris @@ -0,0 +1,60 @@ +CC = gcc +DEBUGFLAGS = -DFIO_INC_DEBUG +CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + -D__EXTENSIONS__ $(DEBUGFLAGS) +OPTFLAGS= -O2 -fno-omit-frame-pointer -g $(EXTFLAGS) +CFLAGS = -std=gnu99 -Wall $(OPTFLAGS) +LIBS = -lpthread -lm -ldl -laio -lrt -lnsl -lsocket +PROGS = fio +SCRIPTS = fio_generate_plots + +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 \ + fifo.c smalloc.c filehash.c lib/strsep.c helpers.c solaris.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 engines/solarisaio.c + +OBJS = $(SOURCE:.c=.o) + +ifneq ($(findstring $(MAKEFLAGS),s),s) +ifndef V + QUIET_CC = @echo ' ' CC $@; + QUIET_DEP = @echo ' ' DEP $@; +endif +endif + +INSTALL = install +prefix = /usr/local +bindir = $(prefix)/bin +mandir = $(prefix)/man + +.c.o: + $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $< + +fio: $(OBJS) + $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS) + +depend: + $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend + +$(PROGS): depend + +all: depend $(PROGS) $(SCRIPTS) + +clean: + -rm -f .depend cscope.out $(OBJS) $(PROGS) core.* core + +cscope: + @cscope -b + +install: $(PROGS) $(SCRIPTS) + $(INSTALL) -m755 -d $(DESTDIR)$(bindir) + $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir) + $(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 cc84fede..adcced65 100644 --- a/README +++ b/README @@ -83,11 +83,18 @@ http://maillist.kernel.dk/fio-devel/ Building -------- -Just type 'make' and 'make install'. +Just type 'make' and 'make install'. If on BSD, for now you have to +specify the BSD Makefile with -f and use gmake (not make), eg: -Note that GNU make is required. On BSD it's available from devel/gmake; -on Solaris it's in the SUNWgmake package. On platforms where GNU make -isn't the default, type 'gmake' instead of 'make'. +$ gmake -f Makefile.FreeBSD && gmake -f Makefile.FreeBSD install + +Same goes for AIX: + +$ gmake -f Makefile.aix && gmake -f Makefile.aix install + +Likewise with OpenSolaris, use the Makefile.solaris to compile there. +The OpenSolaris make should work fine. This might change in the +future if I opt for an autoconf type setup. If your compile fails with an error like this: -- 2.25.1