build system clean-up, support for custom LinkDef added
authorrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 3 Oct 2007 08:56:38 +0000 (08:56 +0000)
committerrichterm <richterm@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 3 Oct 2007 08:56:38 +0000 (08:56 +0000)
14 files changed:
HLT/BASE/HOMER/Makefile.am
HLT/BASE/Makefile.am
HLT/MUON/Makefile.am
HLT/PHOS/Makefile.am
HLT/SampleLib/Makefile.am
HLT/TPCLib/Makefile.am
HLT/TRD/Makefile.am
HLT/libAliHLTHOMER.pkg
HLT/libAliHLTSample.pkg
HLT/libAliHLTTPC.pkg
HLT/libAliHLTTRD.pkg
HLT/libAliHLTUtil.pkg
HLT/libHLTbase.pkg
HLT/libHLTinterface.pkg

index edba1cf54450524e8c4ee16a73e026e2103635dd..f96fa807a273a484c1e60eeec2186329196479c9 100644 (file)
@@ -35,8 +35,7 @@ NOROOT_SRC                    = $(MODULE_SRCS:.cxx=_noRoot.cxx)
 #
 HOMER_DOC                      = HOMERReader.tex
 
-EXTRA_DIST                     = $(MODULE_DHDR) \
-                                 $(HOMER_DOC)
+EXTRA_DIST                     = $(HOMER_DOC)
 
 # automatic generation of data and time of library build
 COMPILE_INFO                   =  AliHLTHOMERCompileInfo.cxx
index b18f7706cd36bf1bf52cb2784287af214a066a1f..e7b1d853903b5918f9d66a1b8eaa33df14986961 100644 (file)
@@ -14,7 +14,7 @@ endif
 
 SUBDIRS                        = . $(UTIL_DIR) interface HOMER
 
-EXTRA_DIST                     = HLTbaseLinkDef.h
+EXTRA_DIST                     = 
 
 AM_CPPFLAGS                    = -DMODULE=$(MODULE)
 
index 80cc8b3adb86ca58c7df63469283c02ea9205ee1..4463a47dab59e49b7b5829156ee44ea624137822 100644 (file)
@@ -3,7 +3,7 @@
 
 MODULE                                 = AliHLTMUON
 
-EXTRA_DIST                     = HLTMUONLinkDef.h
+EXTRA_DIST                     = 
 
 MODDIR                         = $(top_srcdir)
 PKGDEF                         = $(MODDIR)/libAliHLTMUON.pkg
index 7f8ee9cfe4400f3416520b87da56124c7b3b2e83..71311fb0b6d20f8bb959b9ffd7ceaae29d01caf3 100644 (file)
@@ -3,7 +3,7 @@
 
 MODULE                                 = AliHLTPHOS
 
-EXTRA_DIST                     = HLTPHOSLinkDef.h
+EXTRA_DIST                     = 
 
 AM_CPPFLAGS                    = @ALIROOT_CPPFLAGS@ \
                                  -I@ALICE_ROOT@/PHOS \
index cc20ff8b823a28c6bc5fc93c7070b75d27c44cd7..f297e5de4f674a87701fb4502700bbc6a1a23bed 100644 (file)
@@ -8,8 +8,7 @@
 
 MODULE                                 = AliHLTSample
 
-EXTRA_DIST                     = AliHLTSampleLinkDef.h \
-                                 tutorial.c
+EXTRA_DIST                     = tutorial.c
 
 # include the pkg definition which actually contains the source
 # file definitions
index 4f303555ec0317c91b44fefd4616bd15580be296..cbc8cb64e7409e58b533ca316f109f80ddce1d1c 100644 (file)
@@ -3,7 +3,7 @@
 
 MODULE                                 = AliHLTTPC
 
-EXTRA_DIST                     = AliHLTTPCLinkDef.h
+EXTRA_DIST                     = 
 
 AM_CPPFLAGS                    = @ALIROOT_CPPFLAGS@         \
                                  -I$(srcdir)                \
index 766eec60c844cbab65aca5b0d815035ab62ccd83..ff14fdf08535aedc6296446dfff380cf527a01ad 100644 (file)
@@ -3,7 +3,7 @@
 
 MODULE                                 = AliHLTTRD
 
-EXTRA_DIST                     = AliHLTTRDLinkDef.h
+EXTRA_DIST                     = 
 
 AM_CPPFLAGS                    = @ALIROOT_CPPFLAGS@         \
                                  -I$(top_srcdir)/BASE \
index 2503299a074dda86f8a964f4732a06e496121b18..6bde291f7a24e2b718bce0297c4e886f3339117d 100644 (file)
@@ -17,12 +17,12 @@ MODULE_HDRS:=       $(CLASS_HDRS) \
 # file names. Thats why the automatic generation of the ROOT
 # LinkDef file doesn't work for the moment
 MODULE_DHDR:=  AliHLTHOMERLinkDef.h
-#CINTAUTOLINK:=  1
 
 SRCS:=$(patsubst %,BASE/HOMER/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,BASE/HOMER/%,$(CLASS_HDRS))
-HDRS:=$(patsubst %,BASE/HOMER/%,$(MODULE_HDRS))
+HDRS:=$(patsubst %,BASE/HOMER/%,$(CLASS_HDRS))
 DHDR:=$(patsubst %,BASE/HOMER/%,$(MODULE_DHDR))
+CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
 
 EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
index 3f8451bda57ff0ffd6437724018520d97b8a39c7..ae44e8ef6ab10de4ec76f4995f7ac36935b73652 100644 (file)
@@ -28,16 +28,15 @@ CLASS_HDRS:=        AliHLTSampleComponent1.h \
 # ROOT dictionary support
 MODULE_HDRS:=  $(CLASS_HDRS)
 
-# The autotools-based stand-alone built system creates  the LinkDef
-# file required by the ROOT dictionary generation for the all header
-# files specified in CLASS_HDRS.  
-# When creating a ROOT dictionary in AliRoot you must eventually
-# provide a *LinkDef.h file which tells rootcint what to do with the
-# classes. The *LinkDef.h must be added to DHDR in that case.
-# There might be an extension also in ALIROOT which allows to 
-# generate the LinkDef automatically.
-#DHDR:=                SampleLib/AliHLTSampleLinkDef.h         
-CINTAUTOLINK:=1
+# The LinkDef file required by the ROOT dictionary generation can be
+# generated automatically. For the all header files specified in
+# CLASS_HDRS an entry will be generated
+# pragma link C++ class <class-name>+;
+#
+# If the default behavior is not enough, you can provide a custom
+# *LinkDef.h to the MODULE_DHDR variable. Leave MODULE_DHDR empty to
+# enable automatic generation. 
+MODULE_DHDR:=
 
 # extra defines and flags for the AliRoot build system. NOTE: include
 # directories and linking flags/options must be specified in 
@@ -56,3 +55,5 @@ EINCLUDE := HLT/BASE
 SRCS:=$(patsubst %,SampleLib/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,SampleLib/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,SampleLib/%,$(MODULE_HDRS))
+DHDR:=$(patsubst %,SampleLib/%,$(MODULE_DHDR))
+CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
index 6c6efa90abe241b1d83ff275887c514e8af4c03c..fe56dcdcf4ccff2fe5b40f99a6cd6f262f68bdde 100644 (file)
@@ -128,12 +128,13 @@ MODULE_HDRS:=     $(CLASS_HDRS) \
                AliHLTTPCClusterDataFormat.h \
                AliHLTTPCModels.h
 
-DHDR:=                 
-CINTAUTOLINK:=  1
+MODULE_DHDR:=
 
 SRCS:=$(patsubst %,TPCLib/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,TPCLib/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,TPCLib/%,$(MODULE_HDRS))
+DHDR:=$(patsubst %,TPCLib/%,$(MODULE_DHDR))
+CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
 
 EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
index 12a25aee1d279b6092d29332eb5d25d2fe4e45e6..49bdd95422e64c66ea5b787708f986bf27c6e2ce 100644 (file)
@@ -3,11 +3,6 @@
 
 include $(MODDIR)/hlt.conf
 
-# This files defines the source and header files for the
-# libAliHLTSample library and additional flags for the compilation
-# and linking process. For further information refer to the 
-# README.
-
 # library sources
 MODULE_SRCS= \
         AliHLTTRDClusterizerComponent.cxx \
@@ -32,16 +27,15 @@ CLASS_HDRS:= \
 # ROOT dictionary support
 MODULE_HDRS:=  $(CLASS_HDRS)
 
-# The autotools-based stand-alone built system creates  the LinkDef
-# file required by the ROOT dictionary generation for the all header
-# files specified in CLASS_HDRS.  
-# When creating a ROOT dictionary in AliRoot you must eventually
-# provide a *LinkDef.h file which tells rootcint what to do with the
-# classes. The *LinkDef.h must be added to DHDR in that case.
-# There might be an extension also in ALIROOT which allows to 
-# generate the LinkDef automatically.
-DHDR:=                 TRD/AliHLTTRDLinkDef.h          
-CINTAUTOLINK:=
+# The LinkDef file required by the ROOT dictionary generation can be
+# generated automatically. For the all header files specified in
+# CLASS_HDRS an entry will be generated
+# pragma link C++ class <class-name>+;
+#
+# If the default behavior is not enough, you can provide a custom
+# *LinkDef.h to the MODULE_DHDR variable. Leave MODULE_DHDR empty to
+# enable automatic generation. 
+MODULE_DHDR:=  AliHLTTRDLinkDef.h              
 
 # extra defines and flags for the AliRoot build system. NOTE: include
 # directories and linking flags/options must be specified in 
@@ -60,3 +54,5 @@ EINCLUDE := HLT/BASE HLT/BASE/util HLT/TRD TRD RAW
 SRCS:=$(patsubst %,TRD/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,TRD/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,TRD/%,$(MODULE_HDRS))
+DHDR:=$(patsubst %,TRD/%,$(MODULE_DHDR))
+CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
index aa2ff64bb35b89b18564a4d68aa2e918233e379e..c2bc8d60d15aaf281bba9dee185737ed4159bfcc 100644 (file)
@@ -24,12 +24,13 @@ CLASS_HDRS:=        AliHLTFilePublisher.h \
 
 MODULE_HDRS:=  $(CLASS_HDRS)
 
-DHDR:=                 
-CINTAUTOLINK:=  1
+MODULE_DHDR:=          
 
 SRCS:=$(patsubst %,BASE/util/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,BASE/util/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,BASE/util/%,$(MODULE_HDRS))
+DHDR:=$(patsubst %,BASE/util/%,$(MODULE_DHDR))
+CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
 
 EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
index 47f60283efb480121917d942414f777219b7ca80..08d0cafd466ebb96c832923a1c8ed50548ef4243 100644 (file)
@@ -49,13 +49,13 @@ MODULE_HDRS:=       $(CLASS_HDRS) \
                AliHLTDefinitions.h \
                AliHLTStdIncludes.h
 
-#DHDR:=                BASE/HLTbaseLinkDef.h
-DHDR:=                 
-CINTAUTOLINK:=  1
+MODULE_DHDR:=
 
 SRCS:=$(patsubst %,BASE/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,BASE/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,BASE/%,$(MODULE_HDRS))
+DHDR:=$(patsubst %,BASE/%,$(MODULE_DHDR))
+CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
 
 EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
index 2637f6de6e41e505fabe6ae12134cfcf014e79fb..8df01430881e958db9acf40938388cd9ba3a1bec 100644 (file)
@@ -5,14 +5,17 @@ MODULE_SRCS=  AliHLTExternalInterface.cxx
 
 CLASS_HDRS:=   
 
-MODULE_HDRS:=  $(CLASS_HDRS)
+MODULE_HDRS:=  $(CLASS_HDRS) \
+               $(MODULE_SRCS:.cxx=.h)
 
-DHDR:=                 
-CINTAUTOLINK:=  1
+MODULE_DHDR:=          
 
-# SRCS:=$(patsubst %,BASE/interface/%,$(MODULE_SRCS))
-# CINTHDRS:=$(patsubst %,BASE/interface/%,$(CLASS_HDRS))
-# HDRS:=$(patsubst %,BASE/interface/%,$(MODULE_HDRS))
+SRCS:=$(patsubst %,BASE/interface/%,$(MODULE_SRCS))
+CINTHDRS:=$(patsubst %,BASE/interface/%,$(CLASS_HDRS))
+#HDRS:=$(patsubst %,BASE/interface/%,$(MODULE_HDRS))
+DHDR:=$(patsubst %,BASE/interface/%,$(MODULE_DHDR))
+#CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
+CINTAUTOLINK:=
 
 EDEFINE      :=
 PACKCXXFLAGS :=