diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am index 2854431df..283add32a 100755 --- a/benchmarks/Makefile.am +++ b/benchmarks/Makefile.am @@ -26,11 +26,11 @@ benchmarks: $(BENCHMARKS) AM_CXXFLAGS = @DEFAULT_CFLAGS@ -I$(top_srcdir) $(PRECOMPILE_FLAGS) if FFLASFFPACK_PRECOMPILED -AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \ +LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \ $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la \ $(top_builddir)/fflas-ffpack/interfaces/libs/libffpack.la else -AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) +LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) endif PERFPUBLISHERFILE=benchmarks-report.xml diff --git a/examples/Makefile.am b/examples/Makefile.am index 77e5ca601..bd71a1675 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -25,11 +25,11 @@ examples: $(EXAMPLES) AM_CXXFLAGS = @DEFAULT_CFLAGS@ -I$(top_srcdir) $(PRECOMPILE_FLAGS) if FFLASFFPACK_PRECOMPILED -AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \ +LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \ $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la \ $(top_builddir)/fflas-ffpack/interfaces/libs/libffpack.la else -AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) +LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) endif EXAMPLES = pluq diff --git a/tests/Makefile.am b/tests/Makefile.am index cfb0c7fb0..891251122 100755 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -26,9 +26,6 @@ check: AM_CXXFLAGS = ${DEFAULT_CFLAGS} -I$(top_srcdir) $(PRECOMPILE_FLAGS) -#LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARFLAGS) $(PRECOMPILE_LIBS) -#AM_LDFLAGS= $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARFLAGS) $(PRECOMPILE_LIBS) $(PARLIBS) - PERFPUBLISHERFILE=tests-report.xml BASIC_TESTS = \ @@ -66,7 +63,7 @@ BASIC_TESTS = \ regression-check if FFLASFFPACK_PRECOMPILED -AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \ +LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \ $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la \ $(top_builddir)/fflas-ffpack/interfaces/libs/libffpack.la @@ -76,10 +73,10 @@ test_interfaces_c_LDADD = \ $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas_c.la \ $(top_builddir)/fflas-ffpack/interfaces/libs/libffpack_c.la \ -lm -lstdc++ - else -AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) +LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) endif + NOT_A_TEST = \ test-lqup2 \ test-fsquare \ diff --git a/tutorials/Makefile.am b/tutorials/Makefile.am index 467ab3c2e..7e42edc08 100644 --- a/tutorials/Makefile.am +++ b/tutorials/Makefile.am @@ -26,11 +26,11 @@ tutorials: $(TUTORIALS) AM_CXXFLAGS = @DEFAULT_CFLAGS@ -I$(top_srcdir) $(PRECOMPILE_FLAGS) if FFLASFFPACK_PRECOMPILED -AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \ +LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) \ $(top_builddir)/fflas-ffpack/interfaces/libs/libfflas.la \ $(top_builddir)/fflas-ffpack/interfaces/libs/libffpack.la else -AM_LDFLAGS = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) +LDADD = $(CBLAS_LIBS) $(GIVARO_LIBS) $(CUDA_LIBS) $(PARLIBS) endif TUTORIALS = fflas_101 fflas_101_lvl1 fflas-101_1 fflas-101_3 2x2-fgemm 101-fgemm 2x2-pluq 2x2-ftrsv ffpack-solve ffpack-fgesv