From c11883f748f8f192fc6b4b0ec25add8781a8f4a8 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Thu, 23 Nov 2006 15:11:53 +0100
Subject: [PATCH] [PATCH] Get rid of FIO_INST_PREFIX

We don't need it anymore, since we link in known io engines and unknown
ones have to be given with a full path.

Also fixup Makefiles for Solaris and FreeBSD, they were a bit outdated.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---
 Makefile         |  4 ----
 Makefile.FreeBSD | 10 ++++++++--
 Makefile.solaris | 10 ++++++++--
 fio.c            |  1 -
 fio.h            |  1 -
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 1ebad6af..07ec6a9b 100644
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,6 @@ prefix = /usr/local
 bindir = $(prefix)/bin
 libdir = $(prefix)/lib/fio
 
-FIO_INST_DIR = $(subst ','\'',$(prefix))
-
-CFLAGS += '-D_INST_PREFIX="$(FIO_INST_DIR)"'
-
 all: depend $(PROGS) $(SCRIPTS)
 
 fio: $(OBJS)
diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD
index ce7b0566..06cdc80b 100644
--- a/Makefile.FreeBSD
+++ b/Makefile.FreeBSD
@@ -3,11 +3,17 @@ CFLAGS	= -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 PROGS	= fio
 SCRIPTS = fio_generate_plots
 
-OBJS = fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
+OBJS = fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o \
+	filesetup.o eta.o verify.o memory.o io_u.o parse.o
+
+OBJS += engines/fio-engine-cpu.o
+OBJS += engines/fio-engine-mmap.o
+OBJS += engines/fio-engine-posixaio.o
+OBJS += engines/fio-engine-sync.o
 
 all: depend $(PROGS) $(SCRIPTS)
 
-fio: fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
+fio: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) -lpthread -lm
 
 clean:
diff --git a/Makefile.solaris b/Makefile.solaris
index 295928c7..442a1030 100644
--- a/Makefile.solaris
+++ b/Makefile.solaris
@@ -3,11 +3,17 @@ CFLAGS	= -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 PROGS	= fio
 SCRIPTS = fio_generate_plots
 
-OBJS = fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
+OBJS = fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o \
+	filesetup.o eta.o verify.o memory.o io_u.o parse.o
+
+OBJS += engines/fio-engine-cpu.o
+OBJS += engines/fio-engine-mmap.o
+OBJS += engines/fio-engine-posixaio.o
+OBJS += engines/fio-engine-sync.o
 
 all: depend $(PROGS) $(SCRIPTS)
 
-fio: fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
+fio: $(OBJS)
 	$(CC) $(CFLAGS) -o $@ $(OBJS) -lc -lpthread -lm -laio -lrt
 
 clean:
diff --git a/fio.c b/fio.c
index ed14c41f..42ac0c9b 100644
--- a/fio.c
+++ b/fio.c
@@ -45,7 +45,6 @@ int groupid = 0;
 int thread_number = 0;
 int shm_id = 0;
 int temp_stall_ts;
-const char *fio_inst_prefix = _INST_PREFIX;
 
 static volatile int startup_sem;
 
diff --git a/fio.h b/fio.h
index 1115c62e..faa06a4f 100644
--- a/fio.h
+++ b/fio.h
@@ -355,7 +355,6 @@ extern int groupid;
 extern int terse_output;
 extern FILE *f_out;
 extern FILE *f_err;
-extern const char *fio_inst_prefix;
 extern int temp_stall_ts;
 
 extern struct thread_data *threads;
-- 
2.25.1