hlt build system fixed after commit 25261: ifdef in pkg definitions; added explicit...

diff --git a/HLT/BASE/interface/HLTinterface-LinkDef.h b/HLT/BASE/interface/HLTinterface-LinkDef.h
new file mode 100644 (file)
index 0000000..5610633
--- /dev/null
+++ b/HLT/BASE/interface/HLTinterface-LinkDef.h
@@ -0,0 +1,8 @@
+// $Id$
+// Dictionary link def file for the libHLTinterface library
+
+#ifdef __CINT__
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+#endif

diff --git a/HLT/hlt.conf b/HLT/hlt.conf
index 36f5f055c69317a3c3d4d2cb49a821ec0b6fe1bf..74536b5d3dc61c25faea43585a12026417a1f6da 100644 (file)
--- a/HLT/hlt.conf
+++ b/HLT/hlt.conf
@@ -10,6 +10,11 @@ HLTDEFS     := -Duse_aliroot -Duse_root \
 HLTCXXFLAGS := $(filter-out -ansi, $(filter-out -pedantic-errors, $(filter-out -Woverloaded-virtual, $(CXXFLAGS))))
 HLTCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(filter-out -Woverloaded-virtual, $(CFLAGS))))
 HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Woverloaded-virtual, $(CXXFLAGS)))
+HLTSOFLAGS  := $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)
+
+ifeq (win32gcc,$(ALICE_TARGET))
+HLTSOFLAGS  += $(LIBRARY_DEP)
+endif
 
 ifdef ALIDEBUG
 HLTDEFS += -DDEBUG

diff --git a/HLT/libAliHLTComp.pkg b/HLT/libAliHLTComp.pkg
index 6662b13b37d930003968abfd501d1c4718b7826f..7f8f179d40d178441a2c9e34b1bc553d1c1d0492 100644 (file)
--- a/HLT/libAliHLTComp.pkg
+++ b/HLT/libAliHLTComp.pkg
@@ -1,8 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-include $(MODDIR)/hlt.conf
-
 CLASS_HDRS:=   AliHLTCompAgent.h \
                AliHLTCompPreprocessor.h \
                AliHLTCompDefinitions.h \
@@ -21,10 +19,14 @@ MODULE_DHDR:=
 
 EINCLUDE := HLT/BASE HLT/shuttle HLT/TPCLib STEER
 
+LIBRARY_DEP := -lHLTbase -lCDB
+
 ###############################################################################
 #
 # do not change anything below this line
 #
+include $(MODDIR)/hlt.conf
+
 SRCS:=$(patsubst %,comp/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,comp/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,comp/%,$(MODULE_HDRS))
@@ -35,9 +37,4 @@ EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lCDB
-endif
-
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libAliHLTITS.pkg b/HLT/libAliHLTITS.pkg
index 766d8dba13eeff3abf5faa26ca2fe22bff58a992..d68d508a00c95ab1828453d4764e498245aacbe3 100644 (file)
--- a/HLT/libAliHLTITS.pkg
+++ b/HLT/libAliHLTITS.pkg
@@ -1,8 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-include $(MODDIR)/hlt.conf
-
 CLASS_HDRS:=   AliHLTITStrack.h \
                AliHLTITStracker.h \
                AliHLTITSVertexerZ.h \
@@ -14,6 +12,16 @@ MODULE_HDRS:=        $(CLASS_HDRS)
 
 MODULE_DHDR:=          
 
+EINCLUDE := HLT/BASE HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW
+
+LIBRARY_DEP := -lITSrec -lITSbase -lESD -lSTEER -lSTEERBase
+
+###############################################################################
+#
+# do not change anything below this line
+#
+include $(MODDIR)/hlt.conf
+
 SRCS:=$(patsubst %,ITS/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,ITS/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,ITS/%,$(MODULE_HDRS))
@@ -24,10 +32,4 @@ EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-EINCLUDE := HLT/BASE HLT/ITS HLT/MUON/src TPC ITS MUON STEER RAW
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lITSrec -lITSbase -lESD -lSTEER -lSTEERBase
-endif
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libAliHLTMUON.pkg b/HLT/libAliHLTMUON.pkg
index 788caab590d394b6977995046d3c58030f3b39ad..ecd3b371a5c79e2bbb03c94922396aa58024120a 100644 (file)
--- a/HLT/libAliHLTMUON.pkg
+++ b/HLT/libAliHLTMUON.pkg
@@ -1,8 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$ 
 
-include $(MODDIR)/hlt.conf
-
 ###############################################################################
 
 CLASS_HDRS :=  OfflineInterface/AliHLTMUONAgent.h \
@@ -49,8 +47,18 @@ MODULE_HDRS :=       $(MODULE_SRCS:.cxx=.h) \
 # The dictionary linkdef header for rootcint:
 MODULE_DHDR :=         HLTMUONLinkDef.h
 
+EINCLUDE :=    HLT/BASE HLT/MUON HLT/MUON/utils HLT/MUON/OnlineAnalysis \
+               HLT/MUON/OfflineInterface MUON MUON/mapping STEER RAW
+
+LIBRARY_DEP := -lHLTbase -lMUONmapping -lMUONbase -lMUONevaluation \
+               -lMUONsim -lMUONcore -lMUONcalib -lMUONgeometry -lMUONraw \
+               -lCDB -lSTEER -lSTEERBase -lRAWDatarec \
+               -L$(shell root-config --libdir) -lMinuit
+
 ###############################################################################
 
+include $(MODDIR)/hlt.conf
+
 CINTHDRS:=     $(patsubst %,MUON/%,$(CLASS_HDRS))
 SRCS :=        $(patsubst %,MUON/%,$(MODULE_SRCS))
 HDRS :=        $(patsubst %,MUON/%,$(MODULE_HDRS))
@@ -61,14 +69,4 @@ EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-EINCLUDE :=    HLT/BASE HLT/MUON HLT/MUON/utils HLT/MUON/OnlineAnalysis \
-               HLT/MUON/OfflineInterface MUON MUON/mapping STEER RAW
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lMUONmapping -lMUONbase -lMUONevaluation \
-                         -lMUONsim -lMUONcore -lMUONcalib -lMUONgeometry -lMUONraw \
-                         -lCDB -lSTEER -lSTEERBase -lRAWDatarec \
-                         -L$(shell root-config --libdir) -lMinuit
-endif
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libAliHLTPHOS.pkg b/HLT/libAliHLTPHOS.pkg
index 9e496d95a510afc0b08cd093f3f4613384916111..4619fcc6b255e200949ae1468beacf1ad2742eba 100644 (file)
--- a/HLT/libAliHLTPHOS.pkg
+++ b/HLT/libAliHLTPHOS.pkg
@@ -1,18 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$
 # package definition for the libAliHLTPHOS library
-
-
-
-
-
-
-
-
-
-
-include $(MODDIR)/hlt.conf
-
 CLASS_HDRS:=   \
                  AliHLTPHOSBase.h \
                  AliHLTPHOSClusterizer.h \
@@ -90,24 +78,24 @@ MODULE_HDRS:=         $(CLASS_HDRS) \
 
 MODULE_DHDR:=    HLTPHOSLinkDef.h
 
-EDEFINE      := ${HLTDEFS}
-PACKCXXFLAGS := ${HLTCXXFLAGS}
-PACKCFLAGS   := ${HLTCLFAGS}
-PACKDCXXFLAGS:= ${HLTDCXXFLAGS}                
-
 EINCLUDE     := HLT/BASE HLT/BASE/util STEER RAW PHOS
 
+LIBRARY_DEP  := -lHLTbase -lPHOSbase -lPHOSshuttle -lSTEER -lRAWDatarec -lESD
+
 ###############################################################################
 #
 # do not change anything below this line
 #
+include $(MODDIR)/hlt.conf
+
 SRCS:=$(patsubst %,PHOS/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,PHOS/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,PHOS/%,$(MODULE_HDRS))
 DHDR:=$(patsubst %,PHOS/%,$(MODULE_DHDR))
 CINTAUTOLINK:= $(shell test "x$(MODULE_DHDR)" = "x" && echo 1)
 
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lPHOSbase -lSTEER -lRAWDatarec -lESD
-endif
+EDEFINE      := ${HLTDEFS}
+PACKCXXFLAGS := ${HLTCXXFLAGS}
+PACKCFLAGS   := ${HLTCLFAGS}
+PACKDCXXFLAGS:= ${HLTDCXXFLAGS}                
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libAliHLTRCU.pkg b/HLT/libAliHLTRCU.pkg
index 45065fdd48d586ec14ec79186f09a89faa614b0a..83f7251d5cd45f9085299417e9b71690a91fc5d4 100644 (file)
--- a/HLT/libAliHLTRCU.pkg
+++ b/HLT/libAliHLTRCU.pkg
@@ -1,8 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-include $(MODDIR)/hlt.conf
-
 CLASS_HDRS:=   AliHLTAltroChannelSelectorComponent.h \
                AliHLTAltroEncoder.h \
                AliHLTAltroGenerator.h \
@@ -14,6 +12,16 @@ MODULE_HDRS:=        $(CLASS_HDRS)
 
 MODULE_DHDR:=          
 
+EINCLUDE := HLT/BASE RAW
+
+LIBRARY_DEP  := -lHLTbase -lRAWDatarec
+
+###############################################################################
+#
+# do not change anything below this line
+#
+include $(MODDIR)/hlt.conf
+
 SRCS:=$(patsubst %,RCU/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,RCU/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,RCU/%,$(MODULE_HDRS))
@@ -24,10 +32,4 @@ EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-EINCLUDE := HLT/BASE RAW
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lRAWDatarec
-endif
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libAliHLTSample.pkg b/HLT/libAliHLTSample.pkg
index 556a20a269cd7dda2cf13b70633b117dfd4ea8e5..b868d9fb9ffb57e1e19e50a0affc5b739750563d 100644 (file)
--- a/HLT/libAliHLTSample.pkg
+++ b/HLT/libAliHLTSample.pkg
@@ -36,27 +36,24 @@ MODULE_HDRS:=       $(CLASS_HDRS)
 # 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 
-# Makefile.am (stand-alone build system) and here (AliRoot).
-EDEFINE      := ${HLTDEFS}
-PACKCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(CXXFLAGS)))
-PACKCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(CFLAGS)))
-PACKDCXXFLAGS:= $(filter-out -pedantic-errors, $(CXXFLAGS))
-
 EINCLUDE := HLT/BASE HLT/shuttle
 
+LIBRARY_DEP := -lHLTbase -lCDB -lSTEERBase
+
 ###############################################################################
 #
 # do not change anything below this line
 #
+include $(MODDIR)/hlt.conf
+
 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)
 
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lCDB -lSTEERBase
-endif
+EDEFINE      := ${HLTDEFS}
+PACKCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(CXXFLAGS)))
+PACKCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(CFLAGS)))
+PACKDCXXFLAGS:= $(filter-out -pedantic-errors, $(CXXFLAGS))
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libAliHLTTPC.pkg b/HLT/libAliHLTTPC.pkg
index e6a51a91fee4e7ddd7214b82cd656671b92e1eb8..8e3b484479498c8d4a47024c49aef18a221ae839 100644 (file)
--- a/HLT/libAliHLTTPC.pkg
+++ b/HLT/libAliHLTTPC.pkg
@@ -1,8 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-include $(MODDIR)/hlt.conf
-
 CLASS_HDRS:=   AliHLTTPCTransform.h \
                AliHLTTPCAgent.h \
                AliHLTTPCMemHandler.h \
@@ -76,6 +74,8 @@ CLASS_HDRS:=          AliHLTTPCTransform.h \
                AliHLTTPCKryptonClusterFinderComponent.h
 
 
+#              offline/AliHLTTPCOfflineClustererComponent.h
+#              offline/AliHLTTPCOfflineTrackerComponent.h
 
 
 #              AliHLTTPCDDLDataFileHandler.h
@@ -108,17 +108,6 @@ MODULE_HDRS:=      $(CLASS_HDRS) \
 
 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}
-PACKCFLAGS   := ${HLTCLFAGS}
-PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
 EINCLUDE       := HLT/TPCLib \
                   HLT/TPCLib/tracking \
                   HLT/TPCLib/comp \
@@ -131,9 +120,24 @@ EINCLUDE   := HLT/TPCLib \
                   RAW \
                   STEER
 
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lAliHLTRCU -lAliHLTUtil \
-                         -lCDB -lESD -lSTEER -lSTEERBase -lTPCrec -lTPCbase \
-                         -lRAWDatarec
-endif
+LIBRARY_DEP := -lHLTbase -lAliHLTRCU -lAliHLTUtil \
+               -lCDB -lESD -lSTEER -lSTEERBase -lTPCrec -lTPCbase \
+               -lRAWDatarec
+
+###############################################################################
+#
+# do not change anything below this line
+#
+include $(MODDIR)/hlt.conf
+
+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}
+PACKCFLAGS   := ${HLTCLFAGS}
+PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libAliHLTTRD.pkg b/HLT/libAliHLTTRD.pkg
index b6c917dfcbab69f008f210de9074174be50a6cf7..36cf9b3dadaf9e66e43bc6ea2638604fcb3797ba 100644 (file)
--- a/HLT/libAliHLTTRD.pkg
+++ b/HLT/libAliHLTTRD.pkg
@@ -2,8 +2,6 @@
 # $Id$
 # package definition for the libAliHLTTRD library
 
-include $(MODDIR)/hlt.conf
-
 # class header files, the link definition for the root dictionary
 # will be created from the names of the header files
 CLASS_HDRS:= \
@@ -35,28 +33,25 @@ MODULE_HDRS:=       $(CLASS_HDRS)
 # 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 
-# Makefile.am (stand-alone build system) and here (AliRoot).
-EDEFINE      := ${HLTDEFS}
-PACKCXXFLAGS := ${HLTCXXFLAGS}
-PACKCFLAGS   := ${HLTCLFAGS}
-PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
 EINCLUDE := HLT/BASE HLT/BASE/util HLT/TRD TRD STEER RAW
 
+LIBRARY_DEP := -lHLTbase -lAliHLTUtil -lESD -lCDB -lTRDrec -lTRDbase \
+               -lSTEER -lSTEERBase -lRAWDatarec
+
 ###############################################################################
 #
 # do not change anything below this line
 #
+include $(MODDIR)/hlt.conf
+
 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)
 
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lAliHLTUtil -lESD -lCDB -lTRDrec -lTRDbase \
-                         -lSTEER -lSTEERBase -lRAWDatarec 
-endif
+EDEFINE      := ${HLTDEFS}
+PACKCXXFLAGS := ${HLTCXXFLAGS}
+PACKCFLAGS   := ${HLTCLFAGS}
+PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libAliHLTTrigger.pkg b/HLT/libAliHLTTrigger.pkg
index fb7bd44d961aa91ae34966c53f92772c0f052b91..10a6f6101f323a031d4634ee3b9e9d67865cb246 100644 (file)
--- a/HLT/libAliHLTTrigger.pkg
+++ b/HLT/libAliHLTTrigger.pkg
@@ -6,8 +6,6 @@
 # and linking process. For further information refer to the 
 # README.
 
-include $(MODDIR)/hlt.conf
-
 # class header files, the link definition for the root dictionary
 # will be created from the names of the header files
 CLASS_HDRS:= \
@@ -41,10 +39,14 @@ MODULE_DHDR:=
 
 EINCLUDE := HLT/BASE HLT/trigger HLT/TPCLib
 
+LIBRARY_DEP := -lHLTbase
+
 ###############################################################################
 #
 # do not change anything below this line
 #
+include $(MODDIR)/hlt.conf
+
 SRCS:=$(patsubst %,trigger/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,trigger/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,trigger/%,$(MODULE_HDRS))
@@ -55,8 +57,4 @@ EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase
-endif
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libAliHLTUtil.pkg b/HLT/libAliHLTUtil.pkg
index 25a332565680574ca0d6755acf9ac7c9bc966e44..d1c85de18512b6cabd8b334934b541dfe9dad298 100644 (file)
--- a/HLT/libAliHLTUtil.pkg
+++ b/HLT/libAliHLTUtil.pkg
@@ -1,8 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-include $(MODDIR)/hlt.conf
-
 CLASS_HDRS:=   AliHLTFilePublisher.h \
                AliHLTFileWriter.h \
                AliHLTRootFilePublisherComponent.h \
@@ -20,6 +18,12 @@ MODULE_HDRS:=        $(CLASS_HDRS)
 
 MODULE_DHDR:=          
 
+EINCLUDE := HLT/BASE HLT/BASE/util STEER RAW
+
+LIBRARY_DEP := -lHLTbase -lSTEER -lSTEERBase
+
+include $(MODDIR)/hlt.conf
+
 SRCS:=$(patsubst %,BASE/util/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,BASE/util/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,BASE/util/%,$(MODULE_HDRS))
@@ -30,10 +34,4 @@ EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-EINCLUDE := HLT/BASE HLT/BASE/util STEER RAW
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lSTEER -lSTEERBase
-endif
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libHLTinterface.pkg b/HLT/libHLTinterface.pkg
index 336ab7db27b39d640a3413fd0e490b3d01c619f5..5ffe7a313d3441de53961da5398e3b4762fde0ed 100644 (file)
--- a/HLT/libHLTinterface.pkg
+++ b/HLT/libHLTinterface.pkg
@@ -1,8 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-include $(MODDIR)/hlt.conf
-
 MODULE_SRCS=   AliHLTExternalInterface.cxx
 
 CLASS_HDRS:=   
@@ -10,7 +8,13 @@ CLASS_HDRS:=
 MODULE_HDRS:=  $(CLASS_HDRS) \
                $(MODULE_SRCS:.cxx=.h)
 
-MODULE_DHDR:=          
+MODULE_DHDR:=  HLTinterface-LinkDef.h
+
+EINCLUDE := HLT/BASE/interface HLT/BASE
+
+LIBRARY_DEP := -lHLTbase
+
+include $(MODDIR)/hlt.conf
 
 SRCS:=$(patsubst %,BASE/interface/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,BASE/interface/%,$(CLASS_HDRS))
@@ -24,9 +28,4 @@ PACKCXXFLAGS := ${HLTCXXFLAGS}
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
 
-EINCLUDE := HLT/BASE/interface HLT/BASE
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase
-endif
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libHLTrec.pkg b/HLT/libHLTrec.pkg
index 4441f61c06748c36bb4c07de601e7b828d15c3f6..ff16272cb7c19082892c25bb908b38deaf9b5b01 100644 (file)
--- a/HLT/libHLTrec.pkg
+++ b/HLT/libHLTrec.pkg
@@ -1,8 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-include $(MODDIR)/hlt.conf
-
 LIBHLTREC_VERSION := 1
 
 CLASS_HDRS:=   AliHLTReconstructor.h \
@@ -20,6 +18,12 @@ MODULE_HDRS:=        $(CLASS_HDRS)
 
 MODULE_DHDR:=          
 
+EINCLUDE := HLT/rec HLT/BASE HLT/BASE/HOMER STEER RAW
+
+LIBRARY_DEP := -lHLTbase -lCDB -lESD -lSTEERbase -lSTEER -lRAWDatarec -lRAWDatabase
+
+include $(MODDIR)/hlt.conf
+
 SRCS:=$(patsubst %,rec/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,rec/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,rec/%,$(MODULE_HDRS))
@@ -30,10 +34,4 @@ EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS} -DLIBHLTREC_VERSION=$(LIBHLTREC_VERSION)
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-EINCLUDE := HLT/rec HLT/BASE HLT/BASE/HOMER STEER RAW
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lCDB -lESD -lSTEERbase -lSTEER -lRAWDatarec -lRAWDatabase
-endif
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libHLTshuttle.pkg b/HLT/libHLTshuttle.pkg
index 15029c2a1c33c7b968e99bea24a459e253595e66..d419f0c2ba549249ae1b88813256fd84da829076 100644 (file)
--- a/HLT/libHLTshuttle.pkg
+++ b/HLT/libHLTshuttle.pkg
@@ -1,7 +1,5 @@
 #-*- Mode: Makefile -*-
-# $Id: libHLTshuttle.pkg 22878 2007-12-07 15:32:53Z richterm $
-
-include $(MODDIR)/hlt.conf
+# $Id$
 
 LIBHLTSHUTTLE_VERSION := 0
 
@@ -13,6 +11,12 @@ MODULE_HDRS:=        $(CLASS_HDRS)
 
 MODULE_DHDR:=          
 
+EINCLUDE := HLT/shuttle HLT/BASE STEER
+
+LIBRARY_DEP := -lHLTbase -lCDB
+
+include $(MODDIR)/hlt.conf
+
 SRCS:=$(patsubst %,shuttle/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,shuttle/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,shuttle/%,$(MODULE_HDRS))
@@ -23,10 +27,4 @@ EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS} -DLIBHLTREC_VERSION=$(LIBHLTSHUTTLE_VERSION)
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-EINCLUDE := HLT/shuttle HLT/BASE STEER
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lCDB
-endif
+PACKSOFLAGS  := $(HLTSOFLAGS)

diff --git a/HLT/libHLTsim.pkg b/HLT/libHLTsim.pkg
index 29831d89a5f4046b210707043a49ae43e437f570..3f0bcb2c4e87ed160c450feb83dc9900c24d6f5a 100644 (file)
--- a/HLT/libHLTsim.pkg
+++ b/HLT/libHLTsim.pkg
@@ -1,8 +1,6 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-include $(MODDIR)/hlt.conf
-
 LIBHLTSIM_VERSION := 0
 
 MODULE_SRCS=   AliHLTSimulation.cxx \
@@ -15,6 +13,12 @@ MODULE_HDRS:=        $(CLASS_HDRS)
 
 MODULE_DHDR:=          
 
+EINCLUDE := HLT/sim HLT/BASE HLT/BASE/HOMER STEER RAW
+
+LIBRARY_DEP := -lHLTbase -lSTEERbase -lCDB -lSTEER -lRAWDatarec -lRAWDatabase
+
+include $(MODDIR)/hlt.conf
+
 SRCS:=$(patsubst %,sim/%,$(MODULE_SRCS))
 CINTHDRS:=$(patsubst %,sim/%,$(CLASS_HDRS))
 HDRS:=$(patsubst %,sim/%,$(MODULE_HDRS))
@@ -25,10 +29,4 @@ EDEFINE      := ${HLTDEFS}
 PACKCXXFLAGS := ${HLTCXXFLAGS} -DLIBHLTSIM_VERSION=$(LIBHLTSIM_VERSION)
 PACKCFLAGS   := ${HLTCLFAGS}
 PACKDCXXFLAGS:= ${HLTDCXXFLAGS}
-
-EINCLUDE := HLT/sim HLT/BASE HLT/BASE/HOMER STEER RAW
-
-ifeq (win32gcc,$(ALICE_TARGET))
-PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lHLTbase -lSTEERbase -lCDB -lSTEER -lRAWDatarec -lRAWDatabase
-endif
+PACKSOFLAGS  := $(HLTSOFLAGS)