From: richterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 19 Oct 2007 13:07:11 +0000 (+0000)
Subject: enhanced HLT build system: EINCLUDE from pkg definition determines include paths
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=34e89120cb6378e3a059b56309cfc53e90f4c613;hp=a1dbf058e04d5734c3635b3e82db982b26c94123;p=u%2Fmrichter%2FAliRoot.git

enhanced HLT build system: EINCLUDE from pkg definition determines include paths
---

diff --git a/HLT/BASE/Makefile.am b/HLT/BASE/Makefile.am
index e7b1d853903..2a560c1cd5d 100644
--- a/HLT/BASE/Makefile.am
+++ b/HLT/BASE/Makefile.am
@@ -16,8 +16,6 @@ SUBDIRS 			= . $(UTIL_DIR) interface HOMER
 
 EXTRA_DIST			= 
 
-AM_CPPFLAGS			= -DMODULE=$(MODULE)
-
 bin_SCRIPTS			= setenv.sh setenv.csh
 
 # library definition
@@ -33,6 +31,13 @@ MODDIR				= $(top_srcdir)
 PKGDEF				= $(MODDIR)/libHLTbase.pkg
 include $(top_srcdir)/libHLTbase.pkg
 
+# compiler flags
+AM_CPPFLAGS			= -DMODULE=$(MODULE) \
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//!d" -e "s|HLT/|-I$(top_srcdir)/|")) \
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//d" -e "s|^|-I$(ALICE_ROOT)/|"))
+
 # library sources
 libHLTbase_la_SOURCES		= $(MODULE_SRCS)
 
diff --git a/HLT/BASE/util/Makefile.am b/HLT/BASE/util/Makefile.am
index 733b671c916..10a4130b191 100644
--- a/HLT/BASE/util/Makefile.am
+++ b/HLT/BASE/util/Makefile.am
@@ -10,10 +10,6 @@ MODULE				= AliHLTUtil
 
 EXTRA_DIST			=
 
-AM_CPPFLAGS			= @ALIROOT_CPPFLAGS@         \
-				  -DMODULE=$(MODULE)         \
-				  -I$(top_srcdir)/BASE
-
 # library definition
 lib_LTLIBRARIES			=  libAliHLTUtil.la
 
@@ -27,6 +23,13 @@ MODDIR				= $(top_srcdir)
 PKGDEF				= $(MODDIR)/libAliHLTUtil.pkg
 include $(top_srcdir)/libAliHLTUtil.pkg
 
+# compiler flags
+AM_CPPFLAGS			= -DMODULE=$(MODULE)         \
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//!d" -e "s|HLT/|-I$(top_srcdir)/|")) \
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//d" -e "s|^|-I$(ALICE_ROOT)/|"))
+
 # library sources
 libAliHLTUtil_la_SOURCES	= $(MODULE_SRCS)
 
diff --git a/HLT/MUON/Makefile.am b/HLT/MUON/Makefile.am
index 4463a47dab5..a44d7a386f2 100644
--- a/HLT/MUON/Makefile.am
+++ b/HLT/MUON/Makefile.am
@@ -22,16 +22,12 @@ libAliHLTMUON_la_SOURCES	=  $(MODULE_SRCS)
 noinst_HEADERS			=  $(MODULE_HDRS)
 
 # compilation flags of the library
-AM_CPPFLAGS			= @HLTBASE_CPPFLAGS@ \
-				  @ALIROOT_CPPFLAGS@ \
+AM_CPPFLAGS			= -DMODULE=$(MODULE) \
 				  @ROOTCFLAGS@ \
-				  -I$(top_srcdir)/BASE \
-				  -I$(top_srcdir)/MUON \
-				  -I$(top_srcdir)/MUON/OnlineAnalysis \
-				  -I$(top_srcdir)/MUON/OfflineInterface \
-				  -I$(ALICE_ROOT)/MUON \
-				  -I$(ALICE_ROOT)/STEER \
-				  -I$(ALICE_ROOT)/RAW
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//!d" -e "s|HLT/|-I$(top_srcdir)/|")) \
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//d" -e "s|^|-I$(ALICE_ROOT)/|"))
 
 # linking flags of the library
 libAliHLTMUON_la_LDFLAGS	= -L@ROOTLIBDIR@ \
diff --git a/HLT/SampleLib/Makefile.am b/HLT/SampleLib/Makefile.am
index f297e5de4f6..7851e35d26a 100644
--- a/HLT/SampleLib/Makefile.am
+++ b/HLT/SampleLib/Makefile.am
@@ -16,6 +16,7 @@ MODDIR				= $(top_srcdir)
 PKGDEF				= $(MODDIR)/libAliHLTSample.pkg
 include $(top_srcdir)/libAliHLTSample.pkg
 
+
 # library definition
 # The lib_LTLIBRARIES variable is a fixed variable of the autotools build
 # system. All libraries defined by the Makefile template have to be added
@@ -55,11 +56,19 @@ noinst_HEADERS			=  $(MODULE_HDRS)
 
 # compilation flags of the library
 # This is the place to add further include directories if you are
-# using external modules. The AliRoot, ROOT and HLT base directories
+# using external modules. The AliRoot/STEER and ROOT directories
 # are the default include directories.
-AM_CPPFLAGS			= @HLTBASE_CPPFLAGS@ \
+# Include paths within the HLT modules are automatically taken from the
+# EINCLUDE variable of the pkg definition
+# other AliRoot dependencies might need to added
+AM_CPPFLAGS			= -DMODULE=$(MODULE) \
+				  @HLTBASE_CPPFLAGS@ \
 				  @ALIROOT_CPPFLAGS@ \
-				  @ROOTCFLAGS@
+				  @ROOTCFLAGS@ \
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//!d" -e "s|HLT/|-I$(top_srcdir)/|")) \
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//d" -e "s|^|-I$(ALICE_ROOT)/|"))
 
 # linking flags of the library
 # This is the place to add further libraries if you are
diff --git a/HLT/TPCLib/Makefile.am b/HLT/TPCLib/Makefile.am
index cbc8cb64e74..1f523787cff 100644
--- a/HLT/TPCLib/Makefile.am
+++ b/HLT/TPCLib/Makefile.am
@@ -5,12 +5,6 @@ MODULE 				= AliHLTTPC
 
 EXTRA_DIST			= 
 
-AM_CPPFLAGS			= @ALIROOT_CPPFLAGS@         \
-				  -I$(srcdir)                \
-				  -I$(srcdir)/tracking       \
-				  -I$(top_srcdir)/BASE       \
-				  -I$(top_srcdir)/BASE/util
-
 # generation of the TPC Pad mapping tables for the 
 # AliHLTTPCDigitReaderRaw reader
 if USE_TPC_MAPPING
@@ -38,6 +32,13 @@ MODDIR				= $(top_srcdir)
 PKGDEF				= $(MODDIR)/libAliHLTTPC.pkg
 include $(top_srcdir)/libAliHLTTPC.pkg
 
+# compiler flags
+AM_CPPFLAGS			= -DMODULE=$(MODULE) \
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//!d" -e "s|HLT/|-I$(top_srcdir)/|")) \
+				  $(foreach i, $(EINCLUDE),  \
+					$(shell echo $(i) | sed -e "/HLT\//d" -e "s|^|-I$(ALICE_ROOT)/|"))
+
 # library sources
 libAliHLTTPC_la_SOURCES		= $(MODULE_SRCS)
 
diff --git a/HLT/libAliHLTTPC.pkg b/HLT/libAliHLTTPC.pkg
index 656a2cf1eab..98a4dac0e99 100644
--- a/HLT/libAliHLTTPC.pkg
+++ b/HLT/libAliHLTTPC.pkg
@@ -137,4 +137,4 @@ PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
-EINCLUDE := HLT/TPCLib HLT/TPCLib/tracking HLT/BASE HLT/BASE/util TPC RAW
+EINCLUDE := HLT/TPCLib HLT/TPCLib/tracking HLT/BASE HLT/BASE/util TPC RAW STEER