*** ./Makefile.ORIG Wed Jan 26 08:44:12 2011 --- ./Makefile Wed Jan 26 09:01:09 2011 *************** *** 2,9 **** 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 PROGS = fio SCRIPTS = fio_generate_plots --- 2,10 ---- 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 $(EXTFLAGS) CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS) + LDFLAGS = -L/opt/freeware/lib -Wl,-blibpath:/opt/freeware/lib:/usr/lib:/lib -Wl,-bmaxdata:0x80000000 LIBS = -lm PROGS = fio SCRIPTS = fio_generate_plots *************** *** 22,49 **** 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 --- 23,55 ---- 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 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 *************** *** 66,72 **** $(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 --- 72,78 ---- $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $< fio: $(OBJS) ! $(QUIET_CC)$(CC) $(CFLAGS) -o $@ $(LIBS) $(OBJS) $(LDFLAGS) depend: $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend