From a2e9430abec0d82251b60c0afa8bc1f6cec605fe Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Wed, 3 Aug 2016 17:14:32 +0100
Subject: [PATCH] Hadrons: fix after build system update

---
 programs/Hadrons/Global.hpp  | 5 ++---
 programs/Hadrons/Makefile.am | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/programs/Hadrons/Global.hpp b/programs/Hadrons/Global.hpp
index 716aaed9..21e7ac7c 100644
--- a/programs/Hadrons/Global.hpp
+++ b/programs/Hadrons/Global.hpp
@@ -30,8 +30,7 @@ directory.
 
 #include <set>
 #include <stack>
-#include <cxxabi.h>
-#include <Grid.h>
+#include <Grid/Grid.h>
 
 #define BEGIN_HADRONS_NAMESPACE \
 namespace Grid {\
@@ -50,7 +49,7 @@ class HadronsLogger: public Logger
 {
 public:
     HadronsLogger(int on, std::string nm): Logger("Hadrons", on, nm,
-                                                  Logger::BLACK){};
+                                                  GridLogColours, "BLACK"){};
 };
 
 #define LOG(channel) std::cout << HadronsLog##channel
diff --git a/programs/Hadrons/Makefile.am b/programs/Hadrons/Makefile.am
index 64ad5252..2372c025 100644
--- a/programs/Hadrons/Makefile.am
+++ b/programs/Hadrons/Makefile.am
@@ -1,5 +1,4 @@
-AM_CXXFLAGS = -I$(top_srcdir)/programs -I../$(top_srcdir)/programs -I$(top_srcdir)/lib
-AM_LDFLAGS  = -L$(top_builddir)/lib
+AM_CXXFLAGS += -I$(top_srcdir)/programs -I../$(top_srcdir)/programs
 
 bin_PROGRAMS = Hadrons