Fixing up the AliHLTMUON build.

diff --git a/HLT/MUON/Makefile.am b/HLT/MUON/Makefile.am
new file mode 100644 (file)
index 0000000..fcd881b
--- /dev/null
+++ b/HLT/MUON/Makefile.am
@@ -0,0 +1,89 @@
+# $Id$
+# Makefile for the Alice dimuon HLT library
+
+MODULE                                 = AliHLTMUON
+
+EXTRA_DIST                     = HLTMUONLinkDef.h
+
+MODDIR                         = $(top_srcdir)
+PKGDEF                         = $(MODDIR)/libAliHLTMUON.pkg
+include $(top_srcdir)/libAliHLTMUON.pkg
+
+lib_LTLIBRARIES                        =  libAliHLTSample.la
+
+# version info for the library
+# The libtool program is used to created the library, a version number can
+# be specified by using the -version-info flag. This flag accepts an argument
+# of the form current[:revision[:age]].
+# If either revision or age are omitted, they default to 0. Also note that
+# age must be less than or equal to the current interface number. Here are a
+# set of rules to help you update your library version information:
+#
+#   1. Start with version information of 0:0:0 for each libtool library.
+#   2. Update the version information only immediately before a public release
+#      of your software. More frequent updates are unnecessary, and only
+#      guarantee that the current interface number gets larger faster.
+#   3. If the library source code has changed at all since the last update,
+#      then increment revision (c:r:a becomes c:r+1:a).
+#   4. If any interfaces have been added, removed, or changed since the last
+#      update, increment current, and set revision to 0.
+#   5. If any interfaces have been added since the last public release, then
+#      increment age.
+#   6. If any interfaces have been removed since the last public release, then
+#      set age to 0. 
+LIBRARY_VERSION                        = '0:1:0'
+
+# library sources
+# The source files are specified in libAliHLTSample.pkg
+libAliHLTSample_la_SOURCES     =  $(MODULE_SRCS)
+
+# library headers
+# The header files are specified in libAliHLTSample.pkg
+noinst_HEADERS                 =  $(MODULE_HDRS)
+
+# compilation flags of the library
+AM_CPPFLAGS                    = @HLTBASE_CPPFLAGS@ \
+                                 @ALIROOT_CPPFLAGS@ \
+                                 @ROOTCFLAGS@
+
+# linking flags of the library
+libAliHLTSample_la_LDFLAGS     = -L@ROOTLIBDIR@ \
+                                 @ROOTLIBS@ \
+                                 @HLTBASE_LDFLAGS@ \
+                                 @ALIROOT_LDFLAGS@ \
+                                 @ALIROOT_LIBS@ \
+                                 -version-info $(LIBRARY_VERSION)
+
+# set the file name for the generated root dictionary
+DICTCPP                                =  AliHLTMUON-DICT.cxx
+nodist_libAliHLTSample_la_SOURCES    =  $(DICTCPP)
+
+CLEANFILES                     =
+
+###############################################################################
+#
+# do not change anything below this line
+#
+DICTDEF                                =  $(MODULE)-LinkDef.h
+DICTFILES                      =  $(DICTCPP) $(DICTCPP:.cxx=.h) $(DICTDEF)
+DICTHEADERS                    =  $(CLASS_HDRS)
+
+CLEANFILES                     += $(DICTFILES)
+
+
+$(DICTCPP:.cxx=.h): $(DICTCPP)
+       if test $@ ; then : ; else rm -f $< ; $(MAKE) $(MAKEFLAGS) $< ; fi 
+
+$(DICTCPP): $(DICTHEADERS:%=$(srcdir)/%) $(DICTDEF)
+       if [ -x $(ROOTCINT) ]; then $(ROOTCINT) -f $@ -c $(CPPFLAGS) $(AM_CPPFLAGS) $(DEFS) $(foreach i, $(DICTINCLUDE), $(i)) $^ ; fi
+$(DICTDEF): Makefile.am $(PKGDEF)
+       @echo '//automatically generated ROOT DICT definition' > $@
+       @echo '//!!! DO NOT EDIT THIS FILE !!!' >> $@
+       @echo '//add further class definitions to the CLASS_HDRS variable in Makefile.am' >> $@
+       @echo '#ifdef __CINT__' >> $@
+       @echo '#pragma link off all globals;' >> $@
+       @echo '#pragma link off all classes;' >> $@
+       @echo '#pragma link off all functions;' >> $@
+       @$(foreach i, $(DICTHEADERS), \
+          echo "#pragma link C++ class `echo $(i) | sed -e "s|.*/||g" -e "s|\.h.*||"`;" >> $@ ;)
+       @echo '#endif' >> $@

diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.cxx
index 858803eadf859ba71efa699a9b6cc213bde7c2dd..ad2dc1134b4322a22d1bae0f79ecfb34191f651b 100644 (file)
--- a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.cxx
+++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.cxx
@@ -24,7 +24,7 @@
 //         sukalyan.chattopadhyay@saha.ac.in 
 ///////////////////////////////////////////////
 
-#include "AliHLTMUONHitReconstructoronstructor.h"
+#include "AliHLTMUONHitReconstructor.h"
 
 
 const int AliHLTMUONHitReconstructor::fgkDetectorId = 0xA00;

diff --git a/HLT/Makefile.am b/HLT/Makefile.am
index e016667c5ac900b75c717feadc7a59b18b9d033c..43203a40a1dcc4328226c0ecc6a0c9de08b51368 100644 (file)
--- a/HLT/Makefile.am
+++ b/HLT/Makefile.am
@@ -18,11 +18,16 @@ if EN_HLT_TRD
 TRD_DIR=TRD
 endif
 
+if EN_HLT_MUON
+MUON_DIR=MUON
+endif
+
 SUBDIRS                = BASE \
                          $(SAMPLE_DIR) \
                          $(TPC_DIR) \
                          $(PHOS_DIR) \
                          $(TRD_DIR) \
+                         $(MUON_DIR) \
                          doc
 
 EXTRA_DIST             = libHLTbase.pkg \
@@ -32,6 +37,7 @@ EXTRA_DIST            = libHLTbase.pkg \
                          libAliHLTPHOS.pkg \
                          libAliHLTTPC.pkg \
                          libAliHLTTRD.pkg \
+                         libAliHLTMUON.pkg \
                          src/AliHLTReconstructor.h \
                          src/AliHLTReconstructor.cxx \
                          hlt.conf

diff --git a/HLT/hlt.conf b/HLT/hlt.conf
index 842062dd4f009d85674483064aa21e143016c118..dfe4e7d3b6c2588b697997d85b29b0d91341fd6f 100644 (file)
--- a/HLT/hlt.conf
+++ b/HLT/hlt.conf
@@ -1,23 +1,21 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-TMPMAJOR = $.`cat HLT/MUON/src/Version/major.number`
-TMPMINOR = $.`cat HLT/MUON/src/Version/minor.number`
-
 HLTDEFS     := -Duse_aliroot -Duse_root \
                -DROWHOUGHPARAMS -Duse_reconstruction\
                -Duse_newio -DROOTVERSION=\"unchecked\" \
                -DALIROOTVERSION=\"unchecked\" \
-              -D__ROOT__ -DUSE_ALILOG -DLINUX \
-              -DMAJOR_VERSION=$(TMPMAJOR) \
-              -DMINOR_VERSION=$(TMPMINOR) \
-              -DBUILD_NUMBER=0
-
+              -D__ROOT__ -DUSE_ALILOG -DLINUX
 
 HLTCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(CXXFLAGS)))
 HLTCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(CFLAGS)))
 HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(CXXFLAGS))
 
+ifdef ALIDEBUG
+HLTDEFS += -DDEBUG
+else
+HLTDEFS += -DNDEBUG
+endif
 
 ifdef ALIHLT_MLUCDIR
 HLTDEFS         += -Duse_logging

diff --git a/HLT/libAliHLTMUON.pkg b/HLT/libAliHLTMUON.pkg
index 1ce186472cf9ff075fedf3d7c2fdf0d2c10c928c..50a66f3564b88579640c5793e34d887d520cd5c0 100644 (file)
--- a/HLT/libAliHLTMUON.pkg
+++ b/HLT/libAliHLTMUON.pkg
@@ -6,7 +6,7 @@ include HLT/hlt.conf
 ###############################################################################
 
 # Sources that are ROOT classes:
-SOURCES :=     AliHLTMUONUtils.cxx \
+MODULE_SRCS := AliHLTMUONUtils.cxx \
                AliHLTMUONConstants.cxx \
                AliHLTMUONTriggerRecordsBlockStruct.cxx \
                AliHLTMUONTrigRecsDebugBlockStruct.cxx \
@@ -25,18 +25,22 @@ SOURCES :=  AliHLTMUONUtils.cxx \
 
 #              OnlineAnalysis/AliHLTMUONMansoTrackerComponent.cxx \
 
-HEADERS :=     $(SOURCES:.cxx=.h) \
+MODULE_HDRS :=         $(MODULE_SRCS:.cxx=.h) \
                AliHLTMUONDataBlockReader.h \
                AliHLTMUONDataBlockWriter.h
 
+CLASS_HDRS :=  OfflineInterface/AliHLTMUONAgent.h \
+               OfflineInterface/AliHLTMUONRecHitsSource.h
+
 # The dictionary linkdef header for rootcint:
-DICTNRY :=     HLTMUONLinkDef.h
+DICTIONARY :=  HLTMUONLinkDef.h
 
 ###############################################################################
 
-SRCS :=        $(patsubst %,MUON/%,$(SOURCES))
-HDRS :=        $(patsubst %,MUON/%,$(HEADERS))
-DHDR:=                 $(patsubst %,MUON/%,$(DICTNRY))
+CINTHDRS:=     $(patsubst %,MUON/%,$(CLASS_HDRS))
+SRCS :=        $(patsubst %,MUON/%,$(MODULE_SRCS))
+HDRS :=        $(patsubst %,MUON/%,$(MODULE_HDRS))
+DHDR:=                 $(patsubst %,MUON/%,$(DICTIONARY))
 
 EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}