Changes in benchmark/Makefile.am [41cca44:0c1b566]

File:

• benchmark/Makefile.am (modified) (4 diffs)

benchmark/Makefile.am

@@ -33 +33 @@
 TIME_FORMAT = "%E"
 PRINT_FORMAT = %20s: #Comments needed for spacing
+
+LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
 
 .NOTPARALLEL:
@@ -109 +111 @@
 
 ## =========================================================================================================
-CTXSWITCH_DEPEND  =                 \
+ctxswitch$(EXEEXT): \
         loop.run                                \
         function.run                    \
@@ -119 +121 @@
         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-pthread$(EXEEXT):
+        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
+
+ctxswitch-cfa_coroutine$(EXEEXT):
+        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
+
+ctxswitch-cfa_thread$(EXEEXT):
+        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
+
+ctxswitch-cfa_thread2$(EXEEXT):
+        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
+
+ctxswitch-upp_coroutine$(EXEEXT):
+        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
+
+ctxswitch-upp_thread$(EXEEXT):
+        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
 
 ctxswitch-kos_fibre$(EXEEXT):
@@ -133 +149 @@
 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
-
-ctxswitch-cfa_coroutine$(EXEEXT):
-        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
-
-ctxswitch-cfa_thread$(EXEEXT):
-        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
-
-ctxswitch-cfa_thread2$(EXEEXT):
-        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
-
-ctxswitch-upp_coroutine$(EXEEXT):
-        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
-
-ctxswitch-upp_thread$(EXEEXT):
-        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
 
 ctxswitch-goroutine$(EXEEXT):