Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision 41cca44b5b36b35c27f252878c7488107149c20a)
+++ benchmark/Makefile.in	(revision 6d44da10ada82bff3cc9cb4f6e4ab9e24722abb3)
@@ -260,4 +260,9 @@
 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@)
@@ -287,5 +292,5 @@
 
 .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 \
@@ -480,4 +485,14 @@
 	$(am__mv) $$depbase.Tpo $$depbase.Po
 
+<<<<<<< HEAD
+.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/
+
+=======
+>>>>>>> master
 .NOTPARALLEL: