More fixes to FreeBSD and Solaris Makefile

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD
index 6e0f530f492f8065c6b7dcb2085775860860c690..e3144e9b17000114efee4f457b560c286750ffd1 100644 (file)
--- a/Makefile.FreeBSD
+++ b/Makefile.FreeBSD
@@ -1,5 +1,5 @@
 CC     = gcc
 CC     = gcc

-CFLAGS = -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS = -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFIO_INC_DEBUG

 PROGS  = fio
 SCRIPTS = fio_generate_plots
 OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \
 PROGS  = fio
 SCRIPTS = fio_generate_plots
 OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o filesetup.o \


@@ -21,24 +21,27 @@ OBJS += engines/sync.o
 OBJS += engines/null.o
 OBJS += engines/net.o
 
 OBJS += engines/null.o
 OBJS += engines/net.o
 

-all: depend $(PROGS) $(SCRIPTS)
+INSTALL = install
+prefix = /usr/local
+bindir = $(prefix)/bin
+mandir = $(prefix)/man

 
 

+%.o: %.c
+       $(CC) -o $*.o -c $(CFLAGS) $<

 fio: $(OBJS)
        $(CC) $(CFLAGS) -o $@ $(OBJS) -lpthread -lm -ldl -lrt
 
 fio: $(OBJS)
        $(CC) $(CFLAGS) -o $@ $(OBJS) -lpthread -lm -ldl -lrt
 

+all: depend $(PROGS) $(SCRIPTS)
+

 clean:
 clean:

-       -rm -f *.o .depend cscope.out $(PROGS)
+       -rm -f *.o .depend cscope.out $(PROGS) engines/*.o crc/*.o lib/*.o core.* core

 
 depend:
 
 depend:

-       @$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c 1> .depend
+       @$(CC) -MM $(ALL_CFLAGS) *.c engines/*.c crc/*.c 1> .depend

 
 cscope:
        @cscope -b
 
 
 cscope:
        @cscope -b
 

-INSTALL = install
-prefix = /usr/local
-bindir = $(prefix)/bin
-

 install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
 install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)

diff --git a/Makefile.solaris b/Makefile.solaris
index fbdef12c45f3944fb869005a67b6b959efcb2faa..bde0926fd48c4fd01ad54cdf7cfe762635aa4f0d 100644 (file)
--- a/Makefile.solaris
+++ b/Makefile.solaris
@@ -21,8 +21,6 @@ OBJS += engines/sync.o
 OBJS += engines/null.o
 OBJS += engines/net.o
 
 OBJS += engines/null.o
 OBJS += engines/net.o
 

-OBJS += lib/strsep.o
-

 INSTALL = install
 prefix = /usr/local
 bindir = $(prefix)/bin
 INSTALL = install
 prefix = /usr/local
 bindir = $(prefix)/bin