From 629283726b1b4b37cf19a6b992cb9c368be97c0b Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Wed, 3 Aug 2016 15:07:42 +0100
Subject: [PATCH] build system: local Grid link flag moved to configure.ac

---
 benchmarks/Makefile.am   | 2 --
 configure.ac             | 1 +
 tests/IO/Makefile.am     | 2 --
 tests/Makefile.am        | 2 --
 tests/core/Makefile.am   | 2 --
 tests/debug/Makefile.am  | 2 --
 tests/forces/Makefile.am | 2 --
 tests/hmc/Makefile.am    | 2 --
 tests/qdpxx/Makefile.am  | 2 +-
 tests/solver/Makefile.am | 2 --
 10 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
index d8c00e16..60b82dd7 100644
--- a/benchmarks/Makefile.am
+++ b/benchmarks/Makefile.am
@@ -1,3 +1 @@
-AM_LDFLAGS += -L$(top_builddir)/lib
-
 include Make.inc
diff --git a/configure.ac b/configure.ac
index fa3e094f..a57d7bc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,6 +256,7 @@ fi
 cwd=`pwd -P`; cd ${srcdir}; abs_srcdir=`pwd -P`; cd ${cwd}
 AM_CXXFLAGS="-I${abs_srcdir}/include $AM_CXXFLAGS"
 AM_CFLAGS="-I${abs_srcdir}/include $AM_CFLAGS"
+AM_LDFLAGS="-L${cwd}/lib $AM_LDFLAGS"
 AC_SUBST([AM_CFLAGS])
 AC_SUBST([AM_CXXFLAGS])
 AC_SUBST([AM_LDFLAGS])
diff --git a/tests/IO/Makefile.am b/tests/IO/Makefile.am
index d8c00e16..60b82dd7 100644
--- a/tests/IO/Makefile.am
+++ b/tests/IO/Makefile.am
@@ -1,3 +1 @@
-AM_LDFLAGS += -L$(top_builddir)/lib
-
 include Make.inc
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d3b16509..2b8cc2d7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,6 +4,4 @@ if BUILD_CHROMA_REGRESSION
   SUBDIRS+= qdpxx
 endif
 
-AM_LDFLAGS += -L$(top_builddir)/lib
-
 include Make.inc
diff --git a/tests/core/Makefile.am b/tests/core/Makefile.am
index d8c00e16..60b82dd7 100644
--- a/tests/core/Makefile.am
+++ b/tests/core/Makefile.am
@@ -1,3 +1 @@
-AM_LDFLAGS += -L$(top_builddir)/lib
-
 include Make.inc
diff --git a/tests/debug/Makefile.am b/tests/debug/Makefile.am
index d8c00e16..60b82dd7 100644
--- a/tests/debug/Makefile.am
+++ b/tests/debug/Makefile.am
@@ -1,3 +1 @@
-AM_LDFLAGS += -L$(top_builddir)/lib
-
 include Make.inc
diff --git a/tests/forces/Makefile.am b/tests/forces/Makefile.am
index d8c00e16..60b82dd7 100644
--- a/tests/forces/Makefile.am
+++ b/tests/forces/Makefile.am
@@ -1,3 +1 @@
-AM_LDFLAGS += -L$(top_builddir)/lib
-
 include Make.inc
diff --git a/tests/hmc/Makefile.am b/tests/hmc/Makefile.am
index d8c00e16..60b82dd7 100644
--- a/tests/hmc/Makefile.am
+++ b/tests/hmc/Makefile.am
@@ -1,3 +1 @@
-AM_LDFLAGS += -L$(top_builddir)/lib
-
 include Make.inc
diff --git a/tests/qdpxx/Makefile.am b/tests/qdpxx/Makefile.am
index 4c9d01ea..f7f30b85 100644
--- a/tests/qdpxx/Makefile.am
+++ b/tests/qdpxx/Makefile.am
@@ -1,4 +1,4 @@
 AM_CXXFLAGS += `chroma-config --cxxflags`
-AM_LDFLAGS  += -L$(top_builddir)/lib `chroma-config --ldflags` `chroma-config --libs`
+AM_LDFLAGS  += `chroma-config --ldflags` `chroma-config --libs`
 
 include Make.inc
diff --git a/tests/solver/Makefile.am b/tests/solver/Makefile.am
index d8c00e16..60b82dd7 100644
--- a/tests/solver/Makefile.am
+++ b/tests/solver/Makefile.am
@@ -1,3 +1 @@
-AM_LDFLAGS += -L$(top_builddir)/lib
-
 include Make.inc