Changes in benchmark/Makefile.in [41cca44:38d12e7]

File:

• benchmark/Makefile.in (modified) (6 diffs)

benchmark/Makefile.in

@@ -93 +93 @@
 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
@@ -260 +256 @@
 AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
 CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+        $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
+        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
+        $(AM_CFLAGS) $(CFLAGS)
+
 AM_V_CFA = $(am__v_CFA_@AM_V@)
 am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
@@ -277 +278 @@
 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
 
 .SUFFIXES:
-.SUFFIXES: .cfa .o
+.SUFFIXES: .cfa .lo .o
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
         @for dep in $?; do \
@@ -475 +470 @@
 
 
-.cfa.o:
+.cfa.o: $(CFACC) $(CFACPP)
         $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
         $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
         $(am__mv) $$depbase.Tpo $$depbase.Po
+
+.cfa.lo:
+        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+        $(am__mv) $$depbase.Tpo $$depbase.Plo
+
+LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
 
 .NOTPARALLEL:
@@ -549 +551 @@
         $(COMPILE) -DBENCH_N=500000000  fetch_add.c
 
-@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$(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
 
 ctxswitch-pthread$(EXEEXT):
@@ -574 +583 @@
 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):