- compined HLT/AliRoot build system adapted to phos and trd library
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 29 Oct 2007 18:45:22 +0000 (18:45 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 29 Oct 2007 18:45:22 +0000 (18:45 +0000)
- minor corrections/enhancement in HLT build system

13 files changed:
HLT/PHOS/HLTPHOSLinkDef.h
HLT/PHOS/Makefile.am
HLT/TPCLib/AliHLTTPCDigitReaderPacked.cxx
HLT/TPCLib/AliHLTTPCDigitReaderPacked.h
HLT/TPCLib/Makefile.am
HLT/TPCLib/OnlineDisplay/Makefile.am
HLT/TRD/Makefile.am
HLT/libAliHLTPHOS.pkg
HLT/libAliHLTTRD.pkg
HLT/libHLTbase.pkg
HLT/libHLTsim.pkg
HLT/rec/Makefile.am
HLT/sim/Makefile.am

index bf75d23..608724a 100644 (file)
 #pragma link C++ class AliHLTPHOSRawAnalyzerLMS+; 
 #pragma link C++ class AliHLTPHOSRawAnalyzerPeakFinder+; 
 #pragma link C++ class AliHLTPHOSDigit+;
+#pragma link C++ class AliHLTPHOSDigitMaker+;
+#pragma link C++ class AliHLTPHOSBaseline+;
+#pragma link C++ class AliHLTPHOSTreeMaker+;
+#pragma link C++ class AliHLTPHOSRcuDigitMaker+;
+#pragma link C++ class AliHLTPHOSSanityInspector+;
+#pragma link C++ class AliHLTPHOSBaselineAnalyzer+;
+#pragma link C++ class AliHLTPHOSRcuTreeMaker+;
+#pragma link C++ class AliHLTPHOSChannelCounter+;
 
 #endif
index 5d64814..32ca51d 100644 (file)
 
 MODULE                                 = AliHLTPHOS
 
-EXTRA_DIST                     = HLTPHOSLinkDef.h
-
-AM_CPPFLAGS                    = @ALIROOT_CPPFLAGS@ \
-                                 -I@ALICE_ROOT@/PHOS \
-                                 -I$(top_srcdir)/BASE \
-                                 -I$(top_srcdir)/BASE/util
-
+EXTRA_DIST                     = 
 
 # library definition
 lib_LTLIBRARIES                        =  libAliHLTPHOS.la
 
+# version info for the library
+LIBRARY_VERSION                        = '0:0:0'
+
+# MODDIR is set by the AliRoot build system and denotes the topdir
+# of the module, we must set it since the package definition libAliHLTPHOS.pkg
+# includes another common configuration file
+MODDIR                         = $(top_srcdir)
+PKGDEF                         = $(MODDIR)/libAliHLTPHOS.pkg
+include $(top_srcdir)/libAliHLTPHOS.pkg
+
+# compiler flags
+AM_CPPFLAGS                    = -DMODULE=$(MODULE) \
+                                 $(PACKCXXFLAGS) \
+                                 $(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
-libAliHLTPHOS_la_SOURCES       = AliHLTPHOSPulseGenerator.cxx \
-                                 AliHLTPHOSRawAnalyzerPeakFinder.cxx \
-                                 AliHLTPHOSRawAnalyzerCrude.cxx \
-                                 AliHLTPHOSRawAnalyzerKLevel.cxx \
-                                 AliHLTPHOSRawAnalyzerLMS.cxx \
-                                 AliHLTPHOSRawAnalyzerChiSquareFit.cxx \
-                                 AliHLTPHOSRawAnalyzer.cxx \
-                                 AliHLTPHOSEmcCalibData.cxx \
-                                 AliHLTPHOSRawAnalyzerComponent.cxx \
-                                 AliHLTPHOSRawAnalyzerCrudeComponent.cxx \
-                                 AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx \
-                                 AliHLTPHOSDefinitions.cxx \
-                                 AliHLTPHOSFileWriterComponent.cxx \
-                                 AliHLTPHOSFileWriter.cxx \
-                                 AliHLTPHOSDDLPackedFileWriter.cxx \
-                                 AliHLTPHOSCellEnergiesFileWriter.cxx \
-                                 AliHLTPHOSRcuHistogramProducer.cxx \
-                                 AliHLTPHOSRcuHistogramProducerComponent.cxx \
-                                 AliHLTPHOSDataCorruptor.cxx \
-                                 AliHLTPHOSDataQualityMonitor.cxx \
-                                 AliHLTPHOSRcuDataQualityMonitorComponent.cxx \
-                                 AliHLTPHOSProcessor.cxx \
-                                 AliHLTPHOSClusterizer.cxx \
-                                 AliHLTPHOSClusterizerComponent.cxx \
-                                 AliHLTPHOSPhysicsAnalyzerSpectrum.cxx \
-                                 AliHLTPHOSPhysicsAnalyzerSpectrumComponent.cxx \
-                                 AliHLTPHOSPhysicsAnalyzer.cxx \
-                                 AliHLTPHOSPhysicsAnalyzerPeakFitter.cxx \
-                                 AliHLTPHOSSanityInspector.cxx \
-                                 AliHLTPHOSDigitMaker.cxx \
-                                 AliHLTPHOSRcuDigitMaker.cxx \
-                                 AliHLTPHOSDigitMakerComponent.cxx \
-                                 AliHLTPHOSRcuDigitMakerComponent.cxx \
-                                 AliHLTPHOSDigit.cxx \
-                                 AliHLTPHOSChannelCounter.cxx \
-                                 AliHLTPHOSTreeMakerComponent.cxx \
-                                 AliHLTPHOSRcuTreeMakerComponent.cxx \
-                                 AliHLTPHOSTreeMaker.cxx \
-                                 AliHLTPHOSRcuTreeMaker.cxx \
-                                 AliHLTPHOSBaselineAnalyzer.cxx \
-                                 AliHLTPHOSBaselineAnalyzerComponent.cxx \
-                                 AliHLTPHOSBaseline.cxx \
-                                 AliHLTDDLDecoder.cxx \
-                                 AliHLTAltroData.cxx \
-                                 AliHLTAltroBunch.cxx \
-                                 AliHLTPHOSMapper.cxx \
-                                 AliHLTPHOSRcuProcessor.cxx \
-                                 AliHLTPHOSDDLDecoderComponent.cxx \
-                                 AliHLTPHOSBase.cxx \
-                                 AliHLTPHOSConfig.cxx \
-                                 AliHLTPHOSAltroConfig.cxx \
-                                 AliHLTPHOSSandboxComponent.cxx \
-                                 AliHLTPHOSMIPCounter.cxx \
-                                 AliHLTPHOSMIPCounterComponent.cxx 
-#                                AliHLTPHOSNoiseMapper.cxx \
-#                                AliHLTPHOSNoiseMapperComponent.cxx
-
+libAliHLTPHOS_la_SOURCES       = $(MODULE_SRCS)
 
-# class header files, the link definition for the root dictionary
-# will be created from the names of the header files
-CLASS_HDRS                     = AliHLTPHOSPulseGenerator.h \
-                                 AliHLTPHOSRawAnalyzerPeakFinder.h \
-                                 AliHLTPHOSRawAnalyzerCrude.h \
-                                 AliHLTPHOSRawAnalyzerKLevel.h \
-                                 AliHLTPHOSRawAnalyzerLMS.h \
-                                 AliHLTPHOSRawAnalyzerChiSquareFit.h \
-                                 AliHLTPHOSEmcCalibData.h \
-                                 AliHLTPHOSRawAnalyzerComponent.h \
-                                 AliHLTPHOSRawAnalyzerCrudeComponent.h \
-                                 AliHLTPHOSRawAnalyzerPeakFinderComponent.h \
-                                  AliHLTPHOSFileWriterComponent.h \
-                                 AliHLTPHOSFileWriter.h \
-                                 AliHLTPHOSDDLPackedFileWriter.h \
-                                 AliHLTPHOSCellEnergiesFileWriter.h \
-                                 AliHLTPHOSRcuHistogramProducer.h \
-                                 AliHLTPHOSRcuHistogramProducerComponent.h \
-                                 AliHLTPHOSDataCorruptor.h \
-                                 AliHLTPHOSDataQualityMonitor.h \
-                                 AliHLTPHOSRcuDataQualityMonitorComponent.h \
-                                 AliHLTPHOSProcessor.h \
-                                 AliHLTPHOSClusterizer.h \
-                                 AliHLTPHOSClusterizerComponent.h \
-                                 AliHLTPHOSPhysicsAnalyzerSpectrum.h \
-                                 AliHLTPHOSPhysicsAnalyzerSpectrumComponent.h \
-                                 AliHLTPHOSPhysicsAnalyzer.h \
-                                 AliHLTPHOSPhysicsAnalyzerPeakFitter.h \
-                                 AliHLTPHOSSanityInspector.h \
-                                 AliHLTPHOSDigitMaker.h \
-                                 AliHLTPHOSRcuDigitMaker.h \
-                                 AliHLTPHOSDigitMakerComponent.h \
-                                 AliHLTPHOSRcuDigitMakerComponent.h \
-                                 AliHLTPHOSDigit.h \
-                                 AliHLTPHOSChannelCounter.h \
-                                 AliHLTPHOSTreeMakerComponent.h \
-                                 AliHLTPHOSRcuTreeMakerComponent.h \
-                                 AliHLTPHOSTreeMaker.h \
-                                 AliHLTPHOSRcuTreeMaker.h \
-                                 AliHLTPHOSBaselineAnalyzer.h \
-                                 AliHLTPHOSBaselineAnalyzerComponent.h \
-                                 AliHLTPHOSBaseline.h \
-                                 AliHLTDDLDecoder.h \
-                                 AliHLTAltroData.h \
-                                 AliHLTPHOSMapper.h \
-                                 AliHLTPHOSRcuProcessor.h \
-                                 AliHLTPHOSBase.h \
-                                 AliHLTPHOSDDLDecoderComponent.h \
-                                 AliHLTPHOSMapper.h \
-                                 AliHLTPHOSConfig.h \
-                                 AliHLTPHOSAltroConfig.h \
-                                 AliHLTPHOSSandboxComponent.h \
-                                 AliHLTPHOSMIPCounter.h \
-                                 AliHLTPHOSMIPCounterComponent.h 
-#                                AliHLTPHOSNoiseMapper.h \
-#                                AliHLTPHOSNoiseMapperComponent.h
+# library headers
+pkginclude_HEADERS             = $(MODULE_HDRS)
 
-pkginclude_HEADERS             = $(CLASS_HDRS) \
-                                 AliHLTPHOSCommonDefs.h \
-                                 AliHLTPHOSConstants.h \
-                                 AliHLTAltroBunch.h \
-                                 AliHLTPHOSRecPointListDataStruct.h \
-                                 AliHLTPHOSRecPointDataStruct.h \
-                                 AliHLTPHOSClusterDataStruct.h \
-                                 AliHLTPHOSRawAnalyzer.h \
-                                 AliHLTPHOSDefinitions.h \
-                                 AliHLTPHOSModuleCellEnergyDataStruct.h\
-                                 AliHLTPHOSRcuCellEnergyDataStruct.h \
-                                 AliHLTPHOSValidCellDataStruct.h\
-                                 AliHLTPHOSDataHeaderStruct.h \
-                                 AliHLTPHOSModuleCellAccumulatedEnergyDataStruct.h \
-                                 AliHLTPHOSModuleCellAverageEnergyDataStruct.h \
-                                 AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h \
-                                 AliHLTPHOSRcuCellAverageEnergyDataStruct.h \
-                                 AliHLTPHOSRcuChannelDataStruct.h \
-                                 AliHLTPHOSValidChannelDataStruct.h \
-                                 AliHLTPHOSClusterDataStruct.h \
-                                 AliHLTPHOSRecPointDataStruct.h \
-                                 AliHLTPHOSRecPointListDataStruct.h \
-                                 AliHLTPHOSRecPointContainerStruct.h \
-                                 AliHLTPHOSDigitContainerDataStruct.h \
-                                 AliHLTPHOSRcuDigitContainerDataStruct.h \
-                                 AliHLTPHOSDigitDataStruct.h
+# additional link def file
+EXTRA_DIST                     +=$(MODULE_DHDR)
 
 # version info and linking flags for the library
 libAliHLTPHOS_la_LIBADD                = $(top_builddir)/BASE/util/libAliHLTUtil.la
@@ -163,11 +40,8 @@ libAliHLTPHOS_la_LDFLAGS    = -L@ROOTLIBDIR@ \
                                  @ROOTLIBS@ \
                                  @ALIROOT_LDFLAGS@ \
                                  @ALIROOT_LIBS@ \
-                                 -lRAWDatasim \
-                                 -lPHOSbase \
-                                 -lPHOSsim \
-                                 -lPHOSrec \
-                                 -version-info 0:0:0
+                                 @ALIPHOS_LIBS@ \
+                                 -version-info $(LIBRARY_VERSION)
 
 # automatic generation of data and time of library build
 COMPILE_INFO                   =  AliHLTPHOSCompileInfo.cxx
index 3c07fd0..97dd5f6 100644 (file)
@@ -28,7 +28,6 @@
 using namespace std;
 #endif
 
-#if defined(HAVE_ALIRAWDATA) && defined(HAVE_ALITPCRAWSTREAM_H)
 #include "AliHLTTPCDigitReaderPacked.h"
 
 #include "AliTPCRawStream.h"
@@ -42,6 +41,7 @@ using namespace std;
 
 ClassImp(AliHLTTPCDigitReaderPacked)
 
+#if defined(HAVE_ALIRAWDATA) && defined(HAVE_ALITPCRAWSTREAM_H)
 AliHLTTPCDigitReaderPacked::AliHLTTPCDigitReaderPacked()
   :
 #if ENABLE_PAD_SORTING
index 3a3539a..9bac099 100644 (file)
@@ -94,6 +94,8 @@ public:
   {
     HLTFatal("AliHLTTPCDigitReaderPacked not build");
   }
+
+  ClassDef(AliHLTTPCDigitReaderPacked, 0)
 };
 #endif //defined(HAVE_ALIRAWDATA) && defined(HAVE_ALITPCRAWSTREAM_H)
 
index 1f52378..292ad3b 100644 (file)
@@ -51,6 +51,7 @@ libAliHLTTPC_la_LDFLAGS               = -L@ROOTLIBDIR@ \
                                  @ROOTLIBS@ \
                                  @ALIROOT_LDFLAGS@ \
                                  @ALIROOT_LIBS@ \
+                                 @ALITPC_LIBS@ \
                                  -version-info  $(LIBRARY_VERSION)
 
 # automatic generation of data and time of library build
index 04c7369..1ff4fe3 100644 (file)
@@ -5,6 +5,7 @@ MODULE                          = AliHLTTPCDisplay
 
 AM_CPPFLAGS                    = @ALIROOT_CPPFLAGS@         \
                                  @HOMER_CPPFLAGS@ \
+                                 -I$(ALICE_ROOT)/TPC \
                                  -I$(top_srcdir)/BASE       \
                                  -I$(srcdir)/../
 
index 7f68f59..8d66fae 100644 (file)
@@ -3,37 +3,36 @@
 
 MODULE                                 = AliHLTTRD
 
-EXTRA_DIST                     = AliHLTTRDLinkDef.h
-
-AM_CPPFLAGS                    = @ALIROOT_CPPFLAGS@         \
-                                 -I$(top_srcdir)/BASE \
-                                 -I$(top_srcdir)/BASE/util \
-                                 -I$(ALICE_ROOT)/TRD
+EXTRA_DIST                     =
 
 # library definition
-lib_LTLIBRARIES                        =  libAliHLTTRD.la
+lib_LTLIBRARIES                        = libAliHLTTRD.la
 
 # version info for the library
 LIBRARY_VERSION                        = '1:0:0'
 
+# MODDIR is set by the AliRoot build system and denotes the topdir
+# of the module, we must set it since the package definition libAliHLTTRD.pkg
+# includes another common configuration file
+MODDIR                         = $(top_srcdir)
+PKGDEF                         = $(MODDIR)/libAliHLTTRD.pkg
+include $(top_srcdir)/libAliHLTTRD.pkg
+
+# compiler flags
+AM_CPPFLAGS                    = -DMODULE=$(MODULE) \
+                                 $(PACKCXXFLAGS) \
+                                 $(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
-libAliHLTTRD_la_SOURCES                = AliTRDclusterizerHLT.cxx \
-                                 AliHLTTRDDefinitions.cxx \
-                                 AliHLTTRDClusterizerComponent.cxx \
-                                 AliHLTTRDTrackerComponent.cxx \
-                                 AliHLTTRDEsdWriterComponent.cxx \
-                                 AliHLTTRDCalibrationComponent.cxx
+libAliHLTTRD_la_SOURCES                = $(MODULE_SRCS)
 
-# class header files, the link definition for the root dictionary
-# will be created from the names of the header files
-CLASS_HDRS                     = AliTRDclusterizerHLT.h \
-                                 AliHLTTRDDefinitions.h \
-                                 AliHLTTRDClusterizerComponent.h \
-                                 AliHLTTRDTrackerComponent.h \
-                                 AliHLTTRDEsdWriterComponent.h \
-                                 AliHLTTRDCalibrationComponent.h
+# library headers
+pkginclude_HEADERS             = $(MODULE_HDRS)
 
-pkginclude_HEADERS             = $(CLASS_HDRS) 
+# additional link def file
+EXTRA_DIST                     +=$(MODULE_DHDR)
 
 libAliHLTTRD_la_LIBADD         = $(top_builddir)/BASE/util/libAliHLTUtil.la
 # version info for the library
@@ -41,6 +40,7 @@ libAliHLTTRD_la_LDFLAGS               = -L@ROOTLIBDIR@ \
                                  @ROOTLIBS@ \
                                  @ALIROOT_LDFLAGS@ \
                                  @ALIROOT_LIBS@ \
+                                 @ALITRD_LIBS@ \
                                  -version-info  $(LIBRARY_VERSION)
 
 # automatic generation of data and time of library build
index 615c2f8..ae3409d 100644 (file)
 #-*- Mode: Makefile -*-
+# $Id$
+# package definition for the libAliHLTPHOS library
 
 include $(MODDIR)/hlt.conf
 
-SRCS:= \
-                 PHOS/AliHLTAltroBunch.cxx \
-                 PHOS/AliHLTAltroData.cxx \
-                 PHOS/AliHLTPHOSBase.cxx \
-                 PHOS/AliHLTPHOSCellEnergiesFileWriter.cxx \
-                 PHOS/AliHLTPHOSClusterizer.cxx \
-                 PHOS/AliHLTPHOSClusterizerComponent.cxx \
-                 PHOS/AliHLTPHOSDDLDecoderComponent.cxx \
-                 PHOS/AliHLTPHOSDDLPackedFileWriter.cxx \
-                 PHOS/AliHLTPHOSDataCorruptor.cxx \
-                 PHOS/AliHLTPHOSDataQualityMonitor.cxx \
-                 PHOS/AliHLTPHOSDefinitions.cxx \
-                 PHOS/AliHLTPHOSEmcCalibData.cxx \
-                 PHOS/AliHLTPHOSFileWriter.cxx \
-                 PHOS/AliHLTPHOSFileWriterComponent.cxx \
-                 PHOS/AliHLTPHOSPhysicsAnalyzer.cxx \
-                 PHOS/AliHLTPHOSPhysicsAnalyzerPeakFitter.cxx \
-                 PHOS/AliHLTPHOSPhysicsAnalyzerSpectrum.cxx \
-                 PHOS/AliHLTPHOSPhysicsAnalyzerSpectrumComponent.cxx \
-                 PHOS/AliHLTPHOSSanityInspector.cxx \
-                 PHOS/AliHLTPHOSDigit.cxx \
-                 PHOS/AliHLTPHOSDigitMaker.cxx \
-                 PHOS/AliHLTPHOSDigitMakerComponent.cxx \
-                 PHOS/AliHLTPHOSProcessor.cxx \
-                 PHOS/AliHLTPHOSPulseGenerator.cxx \
-                 PHOS/AliHLTPHOSRawAnalyzer.cxx \
-                 PHOS/AliHLTPHOSRawAnalyzerChiSquareFit.cxx \
-                 PHOS/AliHLTPHOSRawAnalyzerComponent.cxx \
-                 PHOS/AliHLTPHOSRawAnalyzerCrude.cxx \
-                 PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx \
-                 PHOS/AliHLTPHOSRawAnalyzerKLevel.cxx \
-                 PHOS/AliHLTPHOSRawAnalyzerLMS.cxx \
-                 PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx \
-                 PHOS/AliHLTPHOSRcuDataQualityMonitorComponent.cxx \
-                 PHOS/AliHLTPHOSRcuHistogramProducer.cxx \
-                 PHOS/AliHLTPHOSRcuHistogramProducerComponent.cxx \
-                 PHOS/AliHLTPHOSRcuProcessor.cxx \
-                 PHOS/AliHLTDDLDecoder.cxx \
-                 PHOS/AliHLTPHOSMapper.cxx \
-                 PHOS/AliHLTPHOSRawAnalyzerPeakFinder.cxx \
-                 PHOS/AliHLTPHOSConfig.cxx \
-                 PHOS/AliHLTPHOSAltroConfig.cxx        
-
-HDRS:=           $(SRCS:.cxx=.h)
+CLASS_HDRS:=   \
+                 AliHLTAltroBunch.h \
+                 AliHLTAltroData.h \
+                 AliHLTPHOSBase.h \
+                 AliHLTPHOSCellEnergiesFileWriter.h \
+                 AliHLTPHOSClusterizer.h \
+                 AliHLTPHOSClusterizerComponent.h \
+                 AliHLTPHOSDDLDecoderComponent.h \
+                 AliHLTPHOSDDLPackedFileWriter.h \
+                 AliHLTPHOSDataCorruptor.h \
+                 AliHLTPHOSDataQualityMonitor.h \
+                 AliHLTPHOSDefinitions.h \
+                 AliHLTPHOSEmcCalibData.h \
+                 AliHLTPHOSFileWriter.h \
+                 AliHLTPHOSFileWriterComponent.h \
+                 AliHLTPHOSPhysicsAnalyzer.h \
+                 AliHLTPHOSPhysicsAnalyzerPeakFitter.h \
+                 AliHLTPHOSPhysicsAnalyzerSpectrum.h \
+                 AliHLTPHOSPhysicsAnalyzerSpectrumComponent.h \
+                 AliHLTPHOSProcessor.h \
+                 AliHLTPHOSPulseGenerator.h \
+                 AliHLTPHOSRawAnalyzer.h \
+                 AliHLTPHOSRawAnalyzerChiSquareFit.h \
+                 AliHLTPHOSRawAnalyzerComponent.h \
+                 AliHLTPHOSRawAnalyzerCrude.h \
+                 AliHLTPHOSRawAnalyzerCrudeComponent.h \
+                 AliHLTPHOSRawAnalyzerKLevel.h \
+                 AliHLTPHOSRawAnalyzerLMS.h \
+                 AliHLTPHOSRawAnalyzerPeakFinderComponent.h \
+                 AliHLTPHOSRcuDataQualityMonitorComponent.h \
+                 AliHLTPHOSRcuHistogramProducer.h \
+                 AliHLTPHOSRcuHistogramProducerComponent.h \
+                 AliHLTPHOSRcuProcessor.h \
+                 AliHLTDDLDecoder.h \
+                 AliHLTPHOSMapper.h \
+                 AliHLTPHOSRawAnalyzerPeakFinder.h \
+                 AliHLTPHOSSanityInspector.h \
+                 AliHLTPHOSDigitMaker.h \
+                 AliHLTPHOSRcuDigitMaker.h \
+                 AliHLTPHOSDigitMakerComponent.h \
+                 AliHLTPHOSRcuDigitMakerComponent.h \
+                 AliHLTPHOSDigit.h \
+                 AliHLTPHOSChannelCounter.h \
+                 AliHLTPHOSTreeMakerComponent.h \
+                 AliHLTPHOSRcuTreeMakerComponent.h \
+                 AliHLTPHOSTreeMaker.h \
+                 AliHLTPHOSRcuTreeMaker.h \
+                 AliHLTPHOSBaselineAnalyzer.h \
+                 AliHLTPHOSBaselineAnalyzerComponent.h \
+                 AliHLTPHOSBaseline.h \
+                 AliHLTPHOSConfig.h \
+                 AliHLTPHOSAltroConfig.h \
+                 AliHLTPHOSSandboxComponent.h \
+                 AliHLTPHOSMIPCounter.h \
+                 AliHLTPHOSMIPCounterComponent.h 
+#                                AliHLTPHOSNoiseMapper.h \
+#                                AliHLTPHOSNoiseMapperComponent.h
+
+MODULE_SRCS:=    $(CLASS_HDRS:.h=.cxx)
+
+MODULE_HDRS:=    $(CLASS_HDRS) \
+                 AliHLTPHOSCommonDefs.h \
+                 AliHLTPHOSConstants.h \
+                 AliHLTAltroBunch.h \
+                 AliHLTPHOSRecPointListDataStruct.h \
+                 AliHLTPHOSRecPointDataStruct.h \
+                 AliHLTPHOSClusterDataStruct.h \
+                 AliHLTPHOSRawAnalyzer.h \
+                 AliHLTPHOSDefinitions.h \
+                 AliHLTPHOSModuleCellEnergyDataStruct.h\
+                 AliHLTPHOSRcuCellEnergyDataStruct.h \
+                 AliHLTPHOSValidCellDataStruct.h\
+                 AliHLTPHOSDataHeaderStruct.h \
+                 AliHLTPHOSModuleCellAccumulatedEnergyDataStruct.h \
+                 AliHLTPHOSModuleCellAverageEnergyDataStruct.h \
+                 AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h \
+                 AliHLTPHOSRcuCellAverageEnergyDataStruct.h \
+                 AliHLTPHOSRcuChannelDataStruct.h \
+                 AliHLTPHOSValidChannelDataStruct.h \
+                 AliHLTPHOSClusterDataStruct.h \
+                 AliHLTPHOSRecPointDataStruct.h \
+                 AliHLTPHOSRecPointListDataStruct.h \
+                 AliHLTPHOSRecPointContainerStruct.h \
+                 AliHLTPHOSDigitContainerDataStruct.h \
+                 AliHLTPHOSRcuDigitContainerDataStruct.h \
+                 AliHLTPHOSDigitDataStruct.h
+
+
+MODULE_DHDR:=    HLTPHOSLinkDef.h
 
 EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}                
 
-DHDR=            PHOS/HLTPHOSLinkDef.h
-
-EINCLUDE+= HLT/BASE HLT/BASE/util HLT/src HLT/comp HLT/misc  STEER RAW PHOS
-#EINCLUDE+= HLT/BASE HLT/BASE/util HLT/src HLT/hough HLT/comp HLT/misc HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW PHOS
-
+EINCLUDE     := HLT/BASE HLT/BASE/util STEER RAW PHOS
 
+###############################################################################
+#
+# do not change anything below this line
+#
+SRCS:=$(patsubst %,PHOS/%,$(MODULE_SRCS))
+CINTHDRS:=$(patsubst %,PHOS/%,$(CLASS_HDRS))
+HDRS:=$(patsubst %,PHOS/%,$(MODULE_HDRS))
+DHDR:=$(patsubst %,PHOS/%,$(MODULE_DHDR))
+CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
index 0c3d6fe..1cd657f 100644 (file)
@@ -1,16 +1,9 @@
 #-*- Mode: Makefile -*-
-# $Id: 
+# $Id$
+# package definition for the libAliHLTTRD library
 
 include $(MODDIR)/hlt.conf
 
-# library sources
-MODULE_SRCS= \
-        AliHLTTRDClusterizerComponent.cxx \
-        AliHLTTRDDefinitions.cxx \
-        AliHLTTRDTrackerComponent.cxx \
-        AliTRDclusterizerHLT.cxx \
-       AliHLTTRDEsdWriterComponent.cxx \
-       AliHLTTRDCalibrationComponent.cxx
 # class header files, the link definition for the root dictionary
 # will be created from the names of the header files
 CLASS_HDRS:= \
@@ -20,6 +13,11 @@ CLASS_HDRS:= \
         AliTRDclusterizerHLT.h \
        AliHLTTRDEsdWriterComponent.h \
        AliHLTTRDCalibrationComponent.h
+
+# library sources
+MODULE_SRCS= \
+       $(CLASS_HDRS:.h=.cxx)
+
 # library headers
 # in most cases you might have already added all the header files to
 # the CLASS_HDRS variable. So we just use the content of this. You
@@ -45,7 +43,7 @@ PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
-EINCLUDE := HLT/BASE HLT/BASE/util HLT/TRD TRD RAW
+EINCLUDE := HLT/BASE HLT/BASE/util HLT/TRD TRD STEER RAW
 
 ###############################################################################
 #
index 531d5e7..0cc9d2b 100644 (file)
@@ -3,10 +3,6 @@
 
 include $(MODDIR)/hlt.conf
 
-MODULE_SRCS=   AliHLT_C_Component_WrapperInterface.cxx \
-               AliHLTDataTypes.cxx \
-               $(CLASS_HDRS:.h=.cxx)
-
 CLASS_HDRS:=   AliHLTComponent.h \
                AliHLTComponentHandler.h \
                AliHLTSystem.h \
@@ -31,6 +27,10 @@ CLASS_HDRS:=         AliHLTComponent.h \
                AliHLTMemoryFile.h \
                AliHLTMessage.h
 
+MODULE_SRCS=   AliHLT_C_Component_WrapperInterface.cxx \
+               AliHLTDataTypes.cxx \
+               $(CLASS_HDRS:.h=.cxx)
+
 MODULE_HDRS:=  $(CLASS_HDRS) \
                AliHLTDataTypes.h \
                AliHLT_C_Component_WrapperInterface.h \
index 85c78ff..538f0da 100644 (file)
@@ -26,4 +26,4 @@ PACKCXXFLAGS := ${HLTCXXFLAGS} -DLIBHLTSIM_VERSION=$(LIBHLTSIM_VERSION)
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
-EINCLUDE := HLT/sim HLT/BASE STEER
+EINCLUDE := HLT/sim HLT/BASE HLT/BASE/HOMER STEER RAW
index d0e1717..eab95e3 100644 (file)
@@ -7,11 +7,6 @@ SUBDIRS                        =
 
 EXTRA_DIST                     = 
 
-AM_CPPFLAGS                    = -DMODULE=$(MODULE) \
-                                 $(PACKCXXFLAGS) \
-                                 @ALIROOT_CPPFLAGS@         \
-                                 -I$(top_srcdir)/BASE
-
 # library definition
 lib_LTLIBRARIES                        =  libHLTrec.la
 
@@ -25,6 +20,13 @@ MODDIR                               = $(top_srcdir)
 PKGDEF                         = $(MODDIR)/libHLTrec.pkg
 include $(top_srcdir)/libHLTrec.pkg
 
+# compiler flags
+AM_CPPFLAGS                    = -DMODULE=$(MODULE) \
+                                 $(PACKCXXFLAGS) \
+                                 $(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
 libHLTrec_la_SOURCES           = $(MODULE_SRCS)
 
index 980939d..fe7fcaf 100644 (file)
@@ -7,11 +7,6 @@ SUBDIRS                        =
 
 EXTRA_DIST                     = 
 
-AM_CPPFLAGS                    = -DMODULE=$(MODULE) \
-                                 $(PACKCXXFLAGS) \
-                                 @ALIROOT_CPPFLAGS@         \
-                                 -I$(top_srcdir)/BASE
-
 # library definition
 lib_LTLIBRARIES                        =  libHLTsim.la
 
@@ -25,6 +20,13 @@ MODDIR                               = $(top_srcdir)
 PKGDEF                         = $(MODDIR)/libHLTsim.pkg
 include $(top_srcdir)/libHLTsim.pkg
 
+# compiler flags
+AM_CPPFLAGS                    = -DMODULE=$(MODULE) \
+                                 $(PACKCXXFLAGS) \
+                                 $(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
 libHLTsim_la_SOURCES           = $(MODULE_SRCS)