Index: benchmark/Makefile.am
===================================================================
--- benchmark/Makefile.am	(revision a9fb796f56bcdcc50c4cfcea5f2ae6641c3b82b2)
+++ benchmark/Makefile.am	(revision b6ad601afc2b4ebc704c5026ec01e1ef6347ff8e)
@@ -33,6 +33,4 @@
 TIME_FORMAT = "%E"
 PRINT_FORMAT = %20s: #Comments needed for spacing
-
-LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
 
 .NOTPARALLEL:
@@ -111,5 +109,5 @@
 
 ## =========================================================================================================
-ctxswitch$(EXEEXT): \
+CTXSWITCH_DEPEND  =                 \
 	loop.run				\
 	function.run			\
@@ -121,9 +119,22 @@
 	ctxswitch-upp_coroutine.run	\
 	ctxswitch-upp_thread.run	\
-	-ctxswitch-kos_fibre.run	\
-	-ctxswitch-kos_fibre2.run	\
 	ctxswitch-goroutine.run		\
 	ctxswitch-java_thread.run
 
+if WITH_LIBFIBRE
+CTXSWITCH_DEPEND  +=           \
+	ctxswitch-kos_fibre.run	 \
+	ctxswitch-kos_fibre2.run
+
+
+ctxswitch-kos_fibre$(EXEEXT):
+	@$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
+
+ctxswitch-kos_fibre2$(EXEEXT):
+	@$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
+endif
+
+ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
+
 ctxswitch-pthread$(EXEEXT):
 	@$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
@@ -143,10 +154,4 @@
 ctxswitch-upp_thread$(EXEEXT):
 	@$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
-
-ctxswitch-kos_fibre$(EXEEXT):
-	@$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
-
-ctxswitch-kos_fibre2$(EXEEXT):
-	@$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
 
 ctxswitch-goroutine$(EXEEXT):
Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision a9fb796f56bcdcc50c4cfcea5f2ae6641c3b82b2)
+++ benchmark/Makefile.in	(revision b6ad601afc2b4ebc704c5026ec01e1ef6347ff8e)
@@ -93,4 +93,8 @@
 host_triplet = @host@
 noinst_PROGRAMS =
+@WITH_LIBFIBRE_TRUE@am__append_1 = \
+@WITH_LIBFIBRE_TRUE@	ctxswitch-kos_fibre.run	 \
+@WITH_LIBFIBRE_TRUE@	ctxswitch-kos_fibre2.run
+
 subdir = benchmark
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -273,4 +277,10 @@
 TIME_FORMAT = "%E"
 PRINT_FORMAT = %20s: #Comments needed for spacing
+CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
+	ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
+	ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
+	ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
+	ctxswitch-goroutine.run ctxswitch-java_thread.run \
+	$(am__append_1)
 testdir = $(top_srcdir)/tests
 all: all-am
@@ -470,6 +480,4 @@
 	$(am__mv) $$depbase.Tpo $$depbase.Po
 
-LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
-
 .NOTPARALLEL:
 
@@ -541,18 +549,11 @@
 	$(COMPILE) -DBENCH_N=500000000  fetch_add.c
 
-ctxswitch$(EXEEXT): \
-	loop.run				\
-	function.run			\
-	fetch_add.run			\
-	ctxswitch-pthread.run		\
-	ctxswitch-cfa_coroutine.run	\
-	ctxswitch-cfa_thread.run	\
-	ctxswitch-cfa_thread2.run	\
-	ctxswitch-upp_coroutine.run	\
-	ctxswitch-upp_thread.run	\
-	-ctxswitch-kos_fibre.run	\
-	-ctxswitch-kos_fibre2.run	\
-	ctxswitch-goroutine.run		\
-	ctxswitch-java_thread.run
+@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
+@WITH_LIBFIBRE_TRUE@	@$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
+
+@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
+@WITH_LIBFIBRE_TRUE@	@$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
+
+ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
 
 ctxswitch-pthread$(EXEEXT):
@@ -573,10 +574,4 @@
 ctxswitch-upp_thread$(EXEEXT):
 	@$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
-
-ctxswitch-kos_fibre$(EXEEXT):
-	@$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
-
-ctxswitch-kos_fibre2$(EXEEXT):
-	@$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
 
 ctxswitch-goroutine$(EXEEXT):