backend: merge in td->o to o-> thread_main() change

[fio.git] / Makefile

diff --git a/Makefile b/Makefile
index 27e82c660a665b4d18ca2949e8c639ab5f5c9001..13a6b8a34c2624d9ffcb91d4a08fc2220ca32f6f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ 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/rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \
                lib/num2str.c lib/ieee754.c $(wildcard crc/*.c) engines/cpu.c \
                engines/mmap.c engines/sync.c engines/null.c engines/net.c \
                memalign.c server.c client.c iolog.c backend.c libfio.c flow.c \
@@ -72,6 +72,9 @@ endif
 ifndef CONFIG_STRSEP
   SOURCE += lib/strsep.c
 endif
+ifndef CONFIG_STRCASESTR
+  SOURCE += lib/strcasestr.c
+endif
 ifndef CONFIG_GETOPT_LONG_ONLY
   SOURCE += lib/getopt_long.c
 endif
@@ -164,7 +167,11 @@ ifndef V
 endif
 endif
 
-INSTALL = install
+ifeq ($(CONFIG_TARGET_OS), SunOS)
+       INSTALL = ginstall
+else
+       INSTALL = install
+endif
 prefix = /usr/local
 bindir = $(prefix)/bin