From d015e398e49f1c8d425906b8c1a3861ecc4d851a Mon Sep 17 00:00:00 2001 From: Bruce Cran Date: Fri, 28 Jan 2011 08:39:09 +0100 Subject: [PATCH] Reinstate unified Makefile Don't use ifeq statements. Signed-off-by: Jens Axboe --- Makefile | 59 +++++++++++++++++++++++++++++++++++++--------- Makefile.FreeBSD | 60 ----------------------------------------------- Makefile.NetBSD | 59 ---------------------------------------------- Makefile.Windows | 61 ------------------------------------------------ Makefile.aix | 59 ---------------------------------------------- Makefile.mac | 60 ----------------------------------------------- Makefile.solaris | 60 ----------------------------------------------- README | 15 ++++-------- 8 files changed, 52 insertions(+), 381 deletions(-) delete mode 100644 Makefile.FreeBSD delete mode 100644 Makefile.NetBSD delete mode 100644 Makefile.Windows delete mode 100644 Makefile.aix delete mode 100644 Makefile.mac delete mode 100644 Makefile.solaris diff --git a/Makefile b/Makefile index 088ecbb8..07e011e3 100644 --- a/Makefile +++ b/Makefile @@ -3,20 +3,57 @@ 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 -lrt -laio +CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) +LIBS = -lm 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 \ - diskutil.c fifo.c blktrace.c smalloc.c filehash.c helpers.c \ - cgroup.c profile.c debug.c trim.c lib/rand.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 - + 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 +endif +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__ +endif +ifeq ($(UNAME), FreeBSD) + SOURCE += helpers.c engines/posixaio.c + LIBS += -lpthread -lrt + CFLAGS += -rdynamic +endif +ifeq ($(UNAME), NetBSD) + SOURCE += helpers.c engines/posixaio.c + LIBS += -lpthread -lrt + CFLAGS += -rdynamic +endif +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__ +endif +ifeq ($(UNAME), Darwin) + SOURCE += helpers.c engines/posixaio.c + LIBS += -lpthread -ldl +endif +ifneq (,$(findstring CYGWIN,$(UNAME))) + SOURCE += engines/windowsaio.c + LIBS += -lpthread -lrt +endif + OBJS = $(SOURCE:.c=.o) ifneq ($(findstring $(MAKEFLAGS),s),s) diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD deleted file mode 100644 index b3014e31..00000000 --- a/Makefile.FreeBSD +++ /dev/null @@ -1,60 +0,0 @@ -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/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 deleted file mode 100644 index 2edf1305..00000000 --- a/Makefile.NetBSD +++ /dev/null @@ -1,59 +0,0 @@ -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/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 deleted file mode 100644 index 45242225..00000000 --- a/Makefile.Windows +++ /dev/null @@ -1,61 +0,0 @@ -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/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 deleted file mode 100644 index 174ffee7..00000000 --- a/Makefile.aix +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 77da86e9..00000000 --- a/Makefile.mac +++ /dev/null @@ -1,60 +0,0 @@ -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/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 deleted file mode 100644 index 267975e3..00000000 --- a/Makefile.solaris +++ /dev/null @@ -1,60 +0,0 @@ -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/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 adcced65..cc84fede 100644 --- a/README +++ b/README @@ -83,18 +83,11 @@ http://maillist.kernel.dk/fio-devel/ Building -------- -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: +Just type 'make' and 'make install'. -$ 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. +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'. If your compile fails with an error like this: -- 2.25.1