*** ./lib/getopt.h.ORIG Wed Jul 13 18:11:14 2011 --- ./lib/getopt.h Wed Jul 13 18:12:24 2011 *************** *** 1,9 **** ! #ifndef _AIX ! #ifndef __hpux #include ! #else /* _AIX */ #ifndef _GETOPT_H #define _GETOPT_H --- 1,8 ---- ! #if !(defined(_AIX) || defined(__hpux)) #include ! #else /* _AIX || __hpux */ #ifndef _GETOPT_H #define _GETOPT_H *************** *** 24,28 **** int getopt_long_only(int, char *const *, const char *, const struct option *, int *); #endif /* _GETOPT_H */ ! #endif /* __hpux */ ! #endif /* _AIX */ --- 23,26 ---- int getopt_long_only(int, char *const *, const char *, const struct option *, int *); #endif /* _GETOPT_H */ ! #endif /* _AIX || __hpux */ *** ./Makefile.ORIG Wed Jul 13 20:05:56 2011 --- ./Makefile Wed Jul 13 20:07:53 2011 *************** *** 43,50 **** 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), HP-UX) SOURCE += fifo.c helpers.c lib/getopt_long.c lib/strsep.c engines/posixaio.c --- 43,50 ---- 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__ + LDFLAGS += -L/opt/freeware/lib -Wl,-blibpath:/opt/freeware/lib:/usr/lib:/lib -Wl,-bmaxdata:0x80000000 endif ifeq ($(UNAME), HP-UX) SOURCE += fifo.c helpers.c lib/getopt_long.c lib/strsep.c engines/posixaio.c *************** *** 80,86 **** $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $< fio: $(OBJS) ! $(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) .depend: $(SOURCE) $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend --- 80,86 ---- $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(CPPFLAGS) $< fio: $(OBJS) ! $(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS) .depend: $(SOURCE) $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend