Add build system fixes due to new Debian/Ubuntu linking.

diff --git a/benchmark.mk.in b/benchmark.mk.in
index 11e1128e51e9a2e64a179127b07789bdab96a62d..113b3cf8fe1a048bbbd09f0ae53cc9eabed06f58 100644 (file)
--- a/benchmark.mk.in
+++ b/benchmark.mk.in
@@ -12,7 +12,7 @@ CXXFLAGS=@CXXFLAGS@
 LDFLAGS=@LDFLAGS@
 
 CXXFLAGS+= @BOOST_CPPFLAGS@ -I../ufc -O3
 LDFLAGS=@LDFLAGS@
 
 CXXFLAGS+= @BOOST_CPPFLAGS@ -I../ufc -O3

-LDFLAGS+= @BOOST_LDFLAGS@ @BOOST_SERIALIZATION_LIB@ @APR1_LIBS@ -lm -lpapi
+LDLIBS+= @BOOST_LDFLAGS@ @BOOST_SERIALIZATION_LIB@ @APR1_LIBS@ -lm -lpapi

 
 all-benchmarks: ${ALL_EXECUTABLES}
 
 
 all-benchmarks: ${ALL_EXECUTABLES}
 

diff --git a/common/generate_ufl_rules.sh b/common/generate_ufl_rules.sh
index 42dedcdf009833e700bf62590a9c5b76040d6b14..5a3ef5e5a4c454055f925a97f46a175882fedee6 100755 (executable)
--- a/common/generate_ufl_rules.sh
+++ b/common/generate_ufl_rules.sh
@@ -56,7 +56,6 @@ for NF in 1 2 3 4; do
       ${ECHO} "${BENCHMARK_SOURCE}: ${BENCHMARK_TEMPLATE}"
       ${ECHO} -e "\tm4 -DMAT_TYPE=${MAT_TYPE} -DNF_VALUE=${NF} -DP_VALUE=${P} -DQ_VALUE=${Q} -DFIELD_RANK=${FIELD_RANK} \$^ > \$@"
       ${ECHO} "${BENCHMARK_EXECUTABLE}: ${BENCHMARK_SOURCE} ${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES}"
       ${ECHO} "${BENCHMARK_SOURCE}: ${BENCHMARK_TEMPLATE}"
       ${ECHO} -e "\tm4 -DMAT_TYPE=${MAT_TYPE} -DNF_VALUE=${NF} -DP_VALUE=${P} -DQ_VALUE=${Q} -DFIELD_RANK=${FIELD_RANK} \$^ > \$@"
       ${ECHO} "${BENCHMARK_EXECUTABLE}: ${BENCHMARK_SOURCE} ${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES}"

-      ${ECHO} -e '\t${CXX} ${CXXFLAGS} ${LDFLAGS} $< -o $@'

 
       CLEAN_FILES="${BENCHMARK_EXECUTABLE} ${TEMPLATE_GENERATED} ${CLEAN_FILES}"
       CLEAN_FILES="${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES} ${CLEAN_FILES}"
 
       CLEAN_FILES="${BENCHMARK_EXECUTABLE} ${TEMPLATE_GENERATED} ${CLEAN_FILES}"
       CLEAN_FILES="${FFC_BUILT_SOURCES} ${EXCAFE_BUILT_SOURCES} ${CLEAN_FILES}"