support for custom LinkDef header

diff --git a/HLT/libAliHLTMUON.pkg b/HLT/libAliHLTMUON.pkg
index 466e8b92f96096df87a541abc2a9d5a06c9dae4b..b02a3f8ce87d367b391c7dd8a9825c8bdf3698ef 100644 (file)
--- a/HLT/libAliHLTMUON.pkg
+++ b/HLT/libAliHLTMUON.pkg
@@ -39,17 +39,20 @@ MODULE_HDRS :=      $(MODULE_SRCS:.cxx=.h) \
                AliHLTMUONDataBlockReader.h \
                AliHLTMUONDataBlockWriter.h \
                AliHLTMUONDataTypes.h \
+               AliHLTMUONList.h \
+               AliHLTMUONCountedList.h \
                OnlineAnalysis/AliHLTMUONMansoTrackerFSMCallback.h
 
 # The dictionary linkdef header for rootcint:
-DICTIONARY :=  HLTMUONLinkDef.h
+MODULE_DHDR :=         HLTMUONLinkDef.h
 
 ###############################################################################
 
 CINTHDRS:=     $(patsubst %,MUON/%,$(CLASS_HDRS))
 SRCS :=        $(patsubst %,MUON/%,$(MODULE_SRCS))
 HDRS :=        $(patsubst %,MUON/%,$(MODULE_HDRS))
-DHDR:=                 $(patsubst %,MUON/%,$(DICTIONARY))
+DHDR:=                 $(patsubst %,MUON/%,$(MODULE_DHDR))
+CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
 
 EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}

diff --git a/HLT/make.dict b/HLT/make.dict
index fd361df68072020096828da8f4e9eb239a191237..ce7b47c53c7dcdee6f72f5ce4b389e496e8149ca 100644 (file)
--- a/HLT/make.dict
+++ b/HLT/make.dict
@@ -1,5 +1,15 @@
 # Makefile template for ROOT dictionary generation
 #
+# This is a common include file which handles generation of the ROOT dictionary
+# files. It creates:
+# - the dict.cxx              (variable DICTCPP)
+# - the dict.h                (variable DICTCPP:.cxx=.h)
+# - optional: the linkdef.h   (variable MODULE postfixed by -LinkDef.h)
+#
+# If the MODULE_DHDR variable is set in the package definition lib<module>.pkg
+# to a custom LinkDef file, the automatic generation of the LinkDef header is
+# disabled. Instead, the specified one is used.
+#
 # usage:
 #  1. set variable CLASS_HDRS to the class header files
 #  2. set DICTCPP variable to dictionary c++ file name
@@ -14,19 +24,23 @@
 #
 # Author: Matthias.Richter@ift.uib.no
 #
-DICTDEF                                =  $(MODULE)-LinkDef.h
-DICTFILES                      =  $(DICTCPP) $(DICTCPP:.cxx=.h) $(DICTDEF)
+DICTAUTODEF                    =  $(MODULE)-LinkDef.h
+DICTDEF                                =  $(shell if test "x$(MODULE_DHDR)" = "x"; then echo $(DICTAUTODEF); else echo $(MODULE_DHDR); fi)
+DICTFILES                      =  $(DICTCPP) $(DICTCPP:.cxx=.h) $(DICTAUTODEF)
 DICTHEADERS                    =  $(CLASS_HDRS)
 
 CLEANFILES                     += $(DICTFILES)
 
+EXTRA_DIST                     += $(MODULE_DHDR)
+
 
 $(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)
+
+$(DICTAUTODEF): 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' >> $@