From 396cdc7417899052a799bd10ed2bae1896c83d62 Mon Sep 17 00:00:00 2001
From: cvetan <cvetan@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Thu, 29 May 2008 16:44:29 +0000
Subject: [PATCH] Using date-config in order to steer the make. Adding amore
 into the DA.

---
 Makefile         | 5 ++---
 build/MakefileDA | 9 +++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 5424029901d..85f35aa0300 100644
--- a/Makefile
+++ b/Makefile
@@ -58,9 +58,8 @@ endif
 #-------------------------------------------------------------------------------
 # Check if DATE is installed
 
-ifdef DATE_ROOT
-DATEFLAGS  = -DALI_DATE -D${DATE_SYS} -DDATE_SYS=${DATE_SYS} -Dlong32=${DATE_LONG32} \
-             -Dlong64='${DATE_LONG64}' -DdatePointer=${DATE_POINTER} -I${DATE_COMMON_DEFS} -I${DATE_MONITOR_DIR}
+ifneq ($(shell date-config 2>&1 | grep -i usage),)
+DATEFLAGS  = -DALI_DATE $(shell date-config --cflags)
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
diff --git a/build/MakefileDA b/build/MakefileDA
index acb37e0ec58..d45a0f7c181 100644
--- a/build/MakefileDA
+++ b/build/MakefileDA
@@ -71,6 +71,15 @@ DAQDADIR=${DAQDALIB_PATH}
 endif
 DAQDALIB=$(DAQDADIR)/libdaqDA.a
 
+ifneq ($(shell amore-config 2>&1 |grep -i usage),)
+AMOREFLAGS = -DALI_AMORE $(shell amore-config --cflags --includes)
+CXXFLAGS  += $(AMOREFLAGS)
+CFLAGS    += $(AMOREFLAGS)
+CINTFLAGS += $(AMOREFLAGS)
+DEPINC    += $(AMOREFLAGS)
+DAQDALIB  += $(shell amore-config --auxlibs)
+endif
+
 ROOTLIBDIR=$(shell root-config --libdir)
 
 SYSLIBS=-ldl -lpthread
-- 
2.39.3