bugfixes for CALO/PHOS in the HLT build system

- non-class header files now assigned to the correct variable
- libAliHLTCalo added as dependency for libAliHLTPHOS

diff --git a/HLT/PHOS/Makefile.am b/HLT/PHOS/Makefile.am
index 44089fd4cf945d816b9e0a56ed0c26ecf73f415a..a7d5679f03fb371348491039063b3117987aa1cd 100644 (file)
--- a/HLT/PHOS/Makefile.am
+++ b/HLT/PHOS/Makefile.am
@@ -35,7 +35,8 @@ pkginclude_HEADERS            = $(MODULE_HDRS)
 EXTRA_DIST                     +=$(MODULE_DHDR)
 
 # version info and linking flags for the library
-libAliHLTPHOS_la_LIBADD                = $(top_builddir)/BASE/util/libAliHLTUtil.la
+libAliHLTPHOS_la_LIBADD                = $(top_builddir)/BASE/util/libAliHLTUtil.la \
+                                 $(top_builddir)/CALO/libAliHLTCalo.la
 libAliHLTPHOS_la_LDFLAGS       = -L@ROOTLIBDIR@ \
                                  @ROOTLIBS@ \
                                  @ALIROOT_LDFLAGS@ \

diff --git a/HLT/libAliHLTCalo.pkg b/HLT/libAliHLTCalo.pkg
index cc59e1de37bb655dd5c163bc2afe142874cfd156..9e31ee1e17668832ea548b1d4d53ae653e8f6ee5 100644 (file)
--- a/HLT/libAliHLTCalo.pkg
+++ b/HLT/libAliHLTCalo.pkg
@@ -21,7 +21,6 @@ AliHLTCaloClusterizerComponent.h \
 AliHLTCaloDigitMaker.h \
 AliHLTCaloClusterAnalyser.h \
 AliHLTCaloRcuProcessor.h \
-AliHLTCaloConstants.h \
 AliHLTCaloProcessor.h 
 
 ## all source files of this module
@@ -37,7 +36,8 @@ MODULE_HDRS:=         $(CLASS_HDRS) \
                AliHLTCaloDigitContainerDataStruct.h \
                AliHLTCaloRecPointDataStruct.h \
                AliHLTCaloRecPointContainerStruct.h \
-               AliHLTCaloRecPointHeaderStruct.h 
+               AliHLTCaloRecPointHeaderStruct.h \
+               AliHLTCaloConstants.h 
 ##             AliHLTCaloChannelDataStruct.h \
 ##             AliHLTCaloChannelDataHeaderStruct.h 
 

diff --git a/HLT/libAliHLTPHOS.pkg b/HLT/libAliHLTPHOS.pkg
index ff212227a548578cdf026f50a2786d5994b8a1e3..54c6e3b1bda89f4f234da9ef45287b18a2ec274a 100644 (file)
--- a/HLT/libAliHLTPHOS.pkg
+++ b/HLT/libAliHLTPHOS.pkg
@@ -32,8 +32,7 @@ CLASS_HDRS:=  AliHLTPHOSClusterizerComponent.h \
                  AliHLTPHOSMonitorTriggerComponent.h \
                  AliHLTPHOSESDEntriesMakerComponent.h \
                  AliHLTPHOSESDCaloClusterWriterComponent.h \
-                 AliHLTPHOSDigitReader.h \
-                 AliHLTPHOSConstants.h
+                 AliHLTPHOSDigitReader.h
 
 MODULE_SRCS:=    $(CLASS_HDRS:.h=.cxx)
 
@@ -47,7 +46,8 @@ MODULE_HDRS:=   $(CLASS_HDRS) \
                  AliHLTPHOSChannelDataStruct.h \
                  AliHLTPHOSChannelDataHeaderStruct.h \
                  AliHLTPHOSCoordinate.h \
-                 AliHLTPHOSChannelRawDataStruct.h
+                 AliHLTPHOSChannelRawDataStruct.h \
+                 AliHLTPHOSConstants.h
 
 ##Left empty for auto generation:
 MODULE_DHDR:=