Compilation on win32gcc: AliGRPPreprocessor moved to STEER to resolve circular dependence

diff --git a/STEER/CDBLinkDef.h b/STEER/CDBLinkDef.h
index 15d545f035b92f0e15dc3b6b61b44aadc04b346a..2ef5e044b5b401f4d4b65b2550a1983af0a7ca15 100644 (file)
--- a/STEER/CDBLinkDef.h
+++ b/STEER/CDBLinkDef.h
@@ -37,7 +37,6 @@
 
 #pragma link C++ class AliShuttleInterface+;
 
-#pragma link C++ class AliGRPPreprocessor+;
 #pragma link C++ class AliGRPDCS+;
 
 #pragma link C++ class  TTreeDataElement+;

diff --git a/STEER/STEERLinkDef.h b/STEER/STEERLinkDef.h
index eb5211c8eb0cde90e90bd2dde1556c4cbe5a7b3d..1a2c0d8a86a87c98ef067c17563affd24e1462d3 100644 (file)
--- a/STEER/STEERLinkDef.h
+++ b/STEER/STEERLinkDef.h
@@ -145,5 +145,6 @@
 #pragma link C++ class AliPlaneEff+;
 
 #pragma link C++ class AliTriggerRunScalers+;
+#pragma link C++ class AliGRPPreprocessor+;
 
 #endif

diff --git a/STEER/libAOD.pkg b/STEER/libAOD.pkg
index efc85242bbc722fecfaa3c8833b86c92e80f6813..12a0a023ae8a40d22ccce754284f34865678d80a 100644 (file)
--- a/STEER/libAOD.pkg
+++ b/STEER/libAOD.pkg
@@ -1,3 +1,5 @@
+#-*- Mode: Makefile -*-
+
 SRCS = AliAODEvent.cxx AliAODHeader.cxx \
        AliAODTrack.cxx AliAODPid.cxx AliAODVertex.cxx \
        AliAODCluster.cxx AliAODCaloCluster.cxx AliAODPmdCluster.cxx AliAODFmdCluster.cxx \
@@ -11,5 +13,7 @@ DHDR= AODLinkDef.h
 
 EXPORT:=$(SRCS:.cxx=.h)
 
-
-
+ifeq (win32gcc,$(ALICE_TARGET))
+PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
+                         -L$(shell root-config --libdir) -lEG
+endif

diff --git a/STEER/libCDB.pkg b/STEER/libCDB.pkg
index d2d81905fd752f64f7de90ae3bb61921154fb2d3..80990a11cc5ed2f493b59c1ec464065ceca49fe5 100644 (file)
--- a/STEER/libCDB.pkg
+++ b/STEER/libCDB.pkg
@@ -1,10 +1,12 @@
+#-*- Mode: Makefile -*-
+
 SRCS          = AliCDBEntry.cxx AliCDBId.cxx AliCDBMetaData.cxx \
 AliCDBPath.cxx AliCDBRunRange.cxx AliCDBManager.cxx \
 AliCDBStorage.cxx AliCDBLocal.cxx AliCDBDump.cxx AliCDBGrid.cxx \
 AliDCSValue.cxx AliDCSSensor.cxx AliDCSSensorArray.cxx \
 AliDCSGenDB.cxx AliSplineFit.cxx TTreeStream.cxx \
 AliPreprocessor.cxx AliShuttleInterface.cxx \
-AliGRPPreprocessor.cxx AliGRPDCS.cxx
+AliGRPDCS.cxx
 
 HDRS:= $(SRCS:.cxx=.h)
 
@@ -16,6 +18,8 @@ AliCDBStorage.h AliCDBLocal.h AliCDBDump.h AliCDBGrid.h \
 AliDCSValue.h AliDCSSensor.h AliDCSSensorArray.h \
 AliDCSGenDB.h AliSplineFit.h TTreeStream.h \
 AliPreprocessor.h  AliShuttleInterface.h \
-AliGRPPreprocessor.h AliGRPDCS.h
-
+AliGRPDCS.h
 
+ifeq (win32gcc,$(ALICE_TARGET))
+PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase -lMinuit
+endif

diff --git a/STEER/libESD.pkg b/STEER/libESD.pkg
index 3acc8a4c4279421307a142a758403ff1355a8331..ddd8bc99220c018bbebfe355c1e9fadc23620aa2 100644 (file)
--- a/STEER/libESD.pkg
+++ b/STEER/libESD.pkg
@@ -1,3 +1,5 @@
+#-*- Mode: Makefile -*-
+
 SRCS = AliESDEvent.cxx AliESDInputHandler.cxx AliESDfriend.cxx AliESD.cxx \
        AliESDtrack.cxx AliESDfriendTrack.cxx\
        AliESDMuonTrack.cxx AliESDPmdTrack.cxx AliESDTrdTrack.cxx AliESDHLTtrack.cxx \
@@ -32,4 +34,7 @@ DHDR= ESDLinkDef.h
 
 EXPORT:=$(SRCS:.cxx=.h)
 
-
+ifeq (win32gcc,$(ALICE_TARGET))
+PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lSTEERBase \
+                         -L$(shell root-config --libdir) -lEG
+endif

diff --git a/STEER/libSTEER.pkg b/STEER/libSTEER.pkg
index d59123f752075736268b7366d25aa9be8c846ca6..bc3b29e49c4cd6f53a65fdc73c13b8429815c81f 100644 (file)
--- a/STEER/libSTEER.pkg
+++ b/STEER/libSTEER.pkg
@@ -1,3 +1,5 @@
+#-*- Mode: Makefile -*-
+
 SRCS          = AliRunLoader.cxx AliLoader.cxx AliDataLoader.cxx  \
 AliObjectLoader.cxx AliBaseLoader.cxx AliTreeLoader.cxx AliTaskLoader.cxx \
 AliDetector.cxx        \
@@ -58,7 +60,7 @@ AliMillepede.cxx \
 AliRecoParam.cxx \
 AliDetectorRecoParam.cxx \
 AliPlaneEff.cxx \
-AliTriggerRunScalers.cxx
+AliTriggerRunScalers.cxx AliGRPPreprocessor.cxx
 
 
 HDRS:= $(SRCS:.cxx=.h) 
@@ -72,3 +74,8 @@ EINCLUDE+= TPC
 
 EXPORT:=$(SRCS:.cxx=.h) AliConst.h AliCallf77.h AliRawDataHeaderSim.h
 
+ifeq (win32gcc,$(ALICE_TARGET))
+PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
+                         -lSTEERBase -lESD -lAOD -lCDB -lRAWDatabase -lRAWDatarec \
+                         -L$(shell root-config --libdir) -lMinuit -lVMC -lEG -lGeom -lProofPlayer
+endif

diff --git a/STEER/libSTEERBase.pkg b/STEER/libSTEERBase.pkg
index 9aaafa879e5e07b4f1b2e34580fcd50d0fc1b917..d41bb79e1fe67f1fa63deb5efe38aaf30a3a6515 100644 (file)
--- a/STEER/libSTEERBase.pkg
+++ b/STEER/libSTEERBase.pkg
@@ -1,3 +1,5 @@
+#-*- Mode: Makefile -*-
+
 SRCS = AliVParticle.cxx \
        AliVEvent.cxx \
        AliVHeader.cxx \
@@ -23,3 +25,7 @@ HDRS:= $(SRCS:.cxx=.h)
 DHDR= STEERBaseLinkDef.h
 
 EXPORT:=$(SRCS:.cxx=.h)
+
+ifeq (win32gcc,$(ALICE_TARGET))
+PACKSOFLAGS:= $(SOFLAGS) -L$(shell root-config --libdir) -lVMC -lEG
+endif