Still did not get the makefiles quite right. It is at least compiling under both...

diff --git a/HLT/MUON/HLTMUONLinkDef.h b/HLT/MUON/HLTMUONLinkDef.h
index 15c5751d4701b1810c91bf9f8ca50718e0da2265..c510c72ac0442be04581a5e6c6ca8f817483521a 100644 (file)
--- a/HLT/MUON/HLTMUONLinkDef.h
+++ b/HLT/MUON/HLTMUONLinkDef.h
@@ -35,6 +35,7 @@
 #pragma link C++ nestedfunction;
 
 #pragma link C++ class AliHLTMUONAgent+;
+#pragma link C++ class AliHLTMUONHitReconstructorComponent+;
 #pragma link C++ class AliHLTMUONRecHitsSource+;
 
 #endif // __CINT__

diff --git a/HLT/MUON/Makefile.am b/HLT/MUON/Makefile.am
index fcd881b0ccab2e9a456634a73e15b2bd14f57f15..00b3aa1adca55fae72aafc0cd79c0d9faea4f872 100644 (file)
--- a/HLT/MUON/Makefile.am
+++ b/HLT/MUON/Makefile.am
@@ -11,26 +11,6 @@ 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
@@ -44,7 +24,14 @@ noinst_HEADERS                       =  $(MODULE_HDRS)
 # compilation flags of the library
 AM_CPPFLAGS                    = @HLTBASE_CPPFLAGS@ \
                                  @ALIROOT_CPPFLAGS@ \
-                                 @ROOTCFLAGS@
+                                 @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
 
 # linking flags of the library
 libAliHLTSample_la_LDFLAGS     = -L@ROOTLIBDIR@ \

diff --git a/HLT/configure.ac b/HLT/configure.ac
index 1b2332e2cbb90d15abb546bdf90b6b12e4a1b3a6..42a2c522d23467a3ef83435c0a76c0aca9867aa3 100644 (file)
--- a/HLT/configure.ac
+++ b/HLT/configure.ac
@@ -491,6 +491,22 @@ fi
 AM_CONDITIONAL(EN_HLT_TRD, test x$enable_trd = xyes)
 AC_MSG_RESULT([$enable_trd])
 
+dnl ------------------------------------------------------------------
+AC_MSG_CHECKING([whether to compile dimuon library])
+AH_TEMPLATE([HLT_MUON],[hlt dimuon library])
+AC_ARG_ENABLE(dimuon,
+  [AC_HELP_STRING([--enable-dimuon],
+      [compile the dimuon library ])],
+  [],[enable_dimuon=yes])
+if test "x$have_aliroot" = "xno" ; then
+   enable_dimuon="no...requires.AliRoot"
+fi
+if test "x$enable_dimuon" = "xyes" ; then 
+  AC_DEFINE(HLT_MUON)
+fi
+AM_CONDITIONAL(EN_HLT_MUON, test x$enable_dimuon = xyes)
+AC_MSG_RESULT([$enable_dimuon])
+
 dnl ------------------------------------------------------------------
 AC_MSG_CHECKING([whether to disable AliRoot logging])
 AH_TEMPLATE([NOALIROOT_LOGGING],[disable AliRoot logging])
@@ -586,6 +602,7 @@ AC_CONFIG_FILES([Makefile
                 TPCLib/OnlineDisplay/Makefile
                 PHOS/Makefile
                 TRD/Makefile
+                MUON/Makefile
                 doc/Makefile
                 doc/doxygen.conf])
 

diff --git a/HLT/libAliHLTMUON.pkg b/HLT/libAliHLTMUON.pkg
index 50a66f3564b88579640c5793e34d887d520cd5c0..8811c31771174292898ce6b6f10de2e60ae0d6af 100644 (file)
--- a/HLT/libAliHLTMUON.pkg
+++ b/HLT/libAliHLTMUON.pkg
@@ -1,12 +1,17 @@
 #-*- Mode: Makefile -*-
 # $Id$ 
 
-include HLT/hlt.conf
+include $(MODDIR)/hlt.conf
 
 ###############################################################################
 
+CLASS_HDRS :=  OnlineAnalysis/AliHLTMUONHitReconstructorComponent.h \
+               OfflineInterface/AliHLTMUONAgent.h \
+               OfflineInterface/AliHLTMUONRecHitsSource.h
+
 # Sources that are ROOT classes:
-MODULE_SRCS := AliHLTMUONUtils.cxx \
+MODULE_SRCS := $(CLASS_HDRS:.h=.cxx) \
+               AliHLTMUONUtils.cxx \
                AliHLTMUONConstants.cxx \
                AliHLTMUONTriggerRecordsBlockStruct.cxx \
                AliHLTMUONTrigRecsDebugBlockStruct.cxx \
@@ -18,20 +23,14 @@ MODULE_SRCS :=      AliHLTMUONUtils.cxx \
                AliHLTMUONMansoCandidatesBlockStruct.cxx \
                AliHLTMUONSinglesDecisionBlockStruct.cxx \
                AliHLTMUONPairsDecisionBlockStruct.cxx \
-               OnlineAnalysis/AliHLTMUONHitReconstructor.cxx \
-               OnlineAnalysis/AliHLTMUONHitReconstructorComponent.cxx \
-               OfflineInterface/AliHLTMUONAgent.cxx \
-               OfflineInterface/AliHLTMUONRecHitsSource.cxx
+               OnlineAnalysis/AliHLTMUONHitReconstructor.cxx
 
-#              OnlineAnalysis/AliHLTMUONMansoTrackerComponent.cxx \
+#              OnlineAnalysis/AliHLTMUONMansoTrackerComponent.cxx
 
 MODULE_HDRS :=         $(MODULE_SRCS:.cxx=.h) \
                AliHLTMUONDataBlockReader.h \
                AliHLTMUONDataBlockWriter.h
 
-CLASS_HDRS :=  OfflineInterface/AliHLTMUONAgent.h \
-               OfflineInterface/AliHLTMUONRecHitsSource.h
-
 # The dictionary linkdef header for rootcint:
 DICTIONARY :=  HLTMUONLinkDef.h
 
@@ -47,5 +46,5 @@ PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
-EINCLUDE +=    HLT/BASE HLT/MUON HLT/MUON/OnlineAnalysis HLT/MUON/OfflineInterface \
-               HLT/MUON/src MUON STEER RAW
+EINCLUDE :=    HLT/BASE HLT/MUON HLT/MUON/OnlineAnalysis HLT/MUON/OfflineInterface MUON STEER RAW
+