including FMD library into HLT build system

diff --git a/HLT/FMD/Makefile.am b/HLT/FMD/Makefile.am
index b39cf118b6e87c2724c33aeddf569a3d4414a127..67e5f3e1e86f4b98e8934b9148a1233295be0958 100644 (file)
--- a/HLT/FMD/Makefile.am
+++ b/HLT/FMD/Makefile.am
@@ -83,7 +83,6 @@ libAliHLTFMD_la_LDFLAGS       = -L@ROOTLIBDIR@ \
                                  @ALIROOT_LDFLAGS@ \
                                  @ALIROOT_LIBS@ \
                                   @ALIFMD_LIBS@ \
-                                  -lFMDbase -lFMDrec \
                                  -version-info $(LIBRARY_VERSION)
 
 # automatic generation of data and time of library build
@@ -96,41 +95,7 @@ nodist_libAliHLTFMD_la_SOURCES= $(COMPILE_INFO) \
 
 CLEANFILES                     = $(COMPILE_INFO)
 
-###############################################################################
-#
-# do not change anything below this line
-#
-DICTDEF                                =  $(MODULE)-LinkDef.h
-DICTFILES                      =  $(DICTCPP) $(DICTCPP:.cxx=.h) $(DICTDEF)
-DICTHEADERS                    =  $(CLASS_HDRS)
-
-CLEANFILES                     += $(DICTFILES)
-
-# the rootcint buffer for macros is limited to 1024 characters
-# we have to filter out some of the defines
-DEFFILTER                      = -DPACKAGE* -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1
-
-
-$(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) \
-        `for i in $(DEFS);do case $$i in $(foreach def, $(DEFFILTER), $(def) |) -DVERSION*);; *) echo -n " $$i";; esac; done` \
-        $(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' >> $@
+include $(top_srcdir)/make.dict
 
 $(COMPILE_INFO): $(libAliHLTFMD_la_SOURCES) $(pkginclude_HEADERS) $(noinst_HEADERS) Makefile.am
        @echo '//automatically generated compilation info' > $@

diff --git a/HLT/Makefile.am b/HLT/Makefile.am
index 37c257942a4e7fe4878046e5d6088972fc74d691..09c903debf81318c2e354c2bf0a86493e972a94a 100644 (file)
--- a/HLT/Makefile.am
+++ b/HLT/Makefile.am
@@ -29,6 +29,10 @@ if EN_HLT_TRD
 TRD_DIR=TRD
 endif
 
+if EN_HLT_FMD
+FMD_DIR=FMD
+endif
+
 if EN_HLT_MUON
 MUON_DIR=MUON
 endif
@@ -52,6 +56,7 @@ SUBDIRS               = BASE \
                          $(TPC_DIR) \
                          $(PHOS_DIR) \
                          $(TRD_DIR) \
+                         $(FMD_DIR) \
                          $(MUON_DIR) \
                          $(COMP_DIR) \
                           $(TRIGGER_DIR) \

diff --git a/HLT/configure.ac b/HLT/configure.ac
index 6873e1189d9b9ddc504dfd0ce62c8d70d33d73e6..8db7e2d699de20f2684f2f3325837dced90676ed 100644 (file)
--- a/HLT/configure.ac
+++ b/HLT/configure.ac
@@ -263,10 +263,10 @@ if test ! "x$have_aliroot" = "xno" ; then
                                  [AliESDEvent esd;
                                   esd.CreateStdContent();
                                   TTree* tree=new TTree("esdTree", "Tree with HLT ESD objects");
-                                  esd.WriteToTree(tree);
                                   TClonesArray* a=new TClonesArray("AliExternalTrackParam");
                                   a->SetName("SomeObject");
                                   esd.AddObject(a);
+                                  esd.WriteToTree(tree);
                                   if (!tree->FindBranch("SomeObject")) return 1;
                                   return 0;])],
                  [have_esd_nonstd=yes], 
@@ -547,7 +547,7 @@ CHECK_HLTMODULE([tpc],
 
 if test "x$enable_module" = "xmissheader"; then
   enable_module="no...missing.headers"
-  enable_tpc="no...missing.headers"
+  enable_tpc=$enable_module
 elif test "x$enable_module" = "xforce"; then
   enable_tpc="yes"
 else
@@ -621,7 +621,7 @@ CHECK_HLTMODULE([rcu],
 
 if test "x$enable_module" = "xmissheader"; then
   enable_module="no...missing.headers"
-  enable_rcu="no...missing.headers"
+  enable_rcu=$enable_module
 elif test "x$enable_module" = "xforce"; then
   enable_rcu="yes"
 else
@@ -663,7 +663,7 @@ CHECK_HLTMODULE([phos],
 
 if test "x$enable_module" = "xmissheader"; then
   enable_module="no...requires.AliRoot>v4-05-07"
-  enable_phos="no...requires.AliRoot>v4-05-07"
+  enable_phos=$enable_module
 elif test "x$enable_module" = "xforce"; then
   enable_phos="yes"
 else
@@ -722,7 +722,7 @@ CHECK_HLTMODULE([trd],
 
 if test "x$enable_module" = "xmissheader"; then
   enable_module="no...requires.AliRoot>v4-07-Release"
-  enable_trd="no...requires.AliRoot>v4-07-Release"
+  enable_trd=$enable_module
 elif test "x$enable_module" = "xforce"; then
   enable_trd="yes"
 else
@@ -765,24 +765,16 @@ ALIFMD_LIBS=$ALIHLTMODULE_LIBS
 CHECK_HLTMODULE([fmd],
                [], [],
                [], [-L$ROOTLIBDIR], [$ROOTLIBS $ADD_ROOTLIBS],
-               [], [-L$ROOTLIBDIR $ALIROOT_LDFLAGS],
+               [FMDbase FMDrec], [-L$ROOTLIBDIR $ALIROOT_LDFLAGS],
                [$ROOTLIBS $ADD_ROOTLIBS $ALIROOT_LIBS])
 
 if test "x$enable_module" = "xmissheader"; then
-  enable_module="no...requires.AliRoot>v4-15-Release"
-  enable_fmd="no...requires.AliRoot>v4-15-Release"
+  enable_module="no...missing.headers"
+  enable_fmd=$enable_module
 elif test "x$enable_module" = "xforce"; then
   enable_fmd="yes"
 else
   enable_fmd=$enable_module
-  if test "x$enable_fmd" = "xyes" ; then
-    AC_LANG_PUSH(C++)
-    save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$save_CPPFLAGS $ALIROOT_CPPFLAGS -I$ALICE_ROOT/FMD"
-    AC_MSG_RESULT([$enable_fmd])
-    AC_LANG_POP(C++)
-    CPPFLAGS="$save_CPPFLAGS"
-  fi
 fi
 
 if test "x$enable_fmd" = "xyes" ; then
@@ -796,7 +788,6 @@ AC_MSG_CHECKING([whether to compile FMD library])
 AC_MSG_RESULT([$enable_module])
 AC_SUBST([ALIFMD_LIBS])
 
-
 dnl ------------------------------------------------------------------
 AH_TEMPLATE([HLT_MUON],[hlt dimuon library])
 
@@ -810,7 +801,7 @@ CHECK_HLTMODULE([dimuon],
 
 if test "x$enable_module" = "xmissheader"; then
   enable_module="no...requires.AliRoot>=v4-08-Release"
-  enable_muon="no...requires.AliRoot>=v4-08-Release"
+  enable_muon=$enable_module
 elif test "x$enable_module" = "xforce"; then
   enable_muon="yes"
 else
@@ -858,7 +849,7 @@ CHECK_HLTMODULE([trigger],
 
 if test "x$enable_module" = "xmissheader"; then
   enable_module="no...header.missing"
-  enable_trigger="no...header.missing"
+  enable_trigger=$enable_module
 elif test "x$enable_module" = "xforce"; then
   enable_trigger="yes"
 else
@@ -888,7 +879,7 @@ CHECK_HLTMODULE([its],
 
 if test "x$enable_module" = "xmissheader"; then
   enable_module="no...header.missing"
-  enable_its="no...header.missing"
+  enable_its=$enable_module
 elif test "x$enable_module" = "xforce"; then
   enable_its="yes"
 else
@@ -934,7 +925,7 @@ CHECK_HLTMODULE([comp],
 
 if test "x$enable_module" = "xmissheader"; then
   enable_module="no...header.missing"
-  enable_comp="no...header.missing"
+  enable_comp=$enable_module
 elif test "x$enable_module" = "xforce"; then
   enable_comp="yes"
 else
@@ -1121,6 +1112,11 @@ if test "x$enable_trd" = "xyes"; then
   AC_CONFIG_FILES([TRD/Makefile])
 fi
 
+AC_MSG_NOTICE([compile FMD library: $enable_fmd])
+if test "x$enable_fmd" = "xyes"; then 
+  AC_CONFIG_FILES([FMD/Makefile])
+fi
+
 AC_MSG_NOTICE([compile MUON library: $enable_muon])
 if test "x$enable_muon" = "xyes"; then 
   AC_CONFIG_FILES([MUON/Makefile])