Using date-config in order to steer the make. Adding amore into the DA.

diff --git a/Makefile b/Makefile
index 5424029901d647bd80abe073ea1061328cf010d4..85f35aa03008f6b1f97f724560f9398ac25243d8 100644 (file)
--- 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 acb37e0ec580da14aa40e502a7118dccf15fb011..d45a0f7c181ae40fe00fb7f47899ba2bea140075 100644 (file)
--- 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