Changes in the ACORDE libraries to compile on Windows/Cygwin

diff --git a/ACORDE/ACORDEbaseLinkDef.h b/ACORDE/ACORDEbaseLinkDef.h
index e95c731f3878c4ffea7b5bb178e66eeceac25ad9..28f02682fa5a5615482de96d569f1d0976152283 100644 (file)
--- a/ACORDE/ACORDEbaseLinkDef.h
+++ b/ACORDE/ACORDEbaseLinkDef.h
@@ -15,5 +15,6 @@
 #pragma link C++ class  AliACORDEPreprocessor+;
 #pragma link C++ class  AliACORDEDataDCS+;
 #pragma link C++ class  AliACORDEdigit+;
+#pragma link C++ class  AliACORDERawStream+;
 
 #endif

diff --git a/ACORDE/ACORDErecLinkDef.h b/ACORDE/ACORDErecLinkDef.h
index c730030db56e5d236f0a847ef161484dd0e4f354..7e5131f8969cf8abca5e26ea07277305ae1c85ba 100644 (file)
--- a/ACORDE/ACORDErecLinkDef.h
+++ b/ACORDE/ACORDErecLinkDef.h
@@ -8,7 +8,6 @@
 #pragma link off all classes;
 #pragma link off all functions;
  
-#pragma link C++ class  AliACORDERawStream+;
 #pragma link C++ class  AliACORDEReconstructor+;
 
  

diff --git a/ACORDE/libACORDEbase.pkg b/ACORDE/libACORDEbase.pkg
index 11606602ed3bfeb11886380706a6ee0256a2a313..6f105042af352e3374cd746a77ff1f16c32285e2 100644 (file)
--- a/ACORDE/libACORDEbase.pkg
+++ b/ACORDE/libACORDEbase.pkg
@@ -1,14 +1,14 @@
 #-*-Mode: Makefile-*-
 
 SRCS = AliACORDEConstants.cxx AliACORDECalibData.cxx \
-       AliGenACORDE.cxx  AliACORDELoader.cxx AliACORDEPreprocessor.cxx AliACORDEdigit.cxx AliACORDEDataDCS.cxx
-                                                                                          
+       AliGenACORDE.cxx  AliACORDELoader.cxx AliACORDEPreprocessor.cxx AliACORDEdigit.cxx AliACORDEDataDCS.cxx AliACORDERawStream.cxx 
+
 HDRS:= $(SRCS:.cxx=.h)
-                                                                                          
+
 DHDR:=ACORDEbaseLinkDef.h
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lSTEER -lCDB -lSTEERBase \
+                         -lSTEER -lCDB -lSTEERBase  -lRAWDatarec -lRAWDatabase \
 #                         -L$(shell root-config --libdir) -lGeom
 endif

diff --git a/ACORDE/libACORDErec.pkg b/ACORDE/libACORDErec.pkg
index 8b85da0187dff545026465eca1b42a5307bdeca5..fdcc7c15f67b3ec659064807b2a653bb4310b95a 100644 (file)
--- a/ACORDE/libACORDErec.pkg
+++ b/ACORDE/libACORDErec.pkg
@@ -1,4 +1,6 @@
-SRCS = AliACORDERawStream.cxx \
+#-*-Mode: Makefile-*-
+
+SRCS = \
        AliACORDEReconstructor.cxx
                                                                                
 HDRS:= $(SRCS:.cxx=.h)
@@ -9,5 +11,5 @@ EINCLUDE := RAW
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lSTEERBase -lRAWDatarec -lRAWDatabase
+                         -lACORDEbase -lSTEERBase -lESD -lSTEER
 endif

diff --git a/ACORDE/libACORDEsim.pkg b/ACORDE/libACORDEsim.pkg
index 167a61ed123885fdae93c5383b6514bcb7736b92..8f33d11eace88eb540e928637528de2a67480ffa 100644 (file)
--- a/ACORDE/libACORDEsim.pkg
+++ b/ACORDE/libACORDEsim.pkg
@@ -12,7 +12,7 @@ DHDR:=ACORDEsimLinkDef.h
 
 ifeq (win32gcc,$(ALICE_TARGET))
 PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
-                         -lACORDEbase -lACORDErec -lSTEER -lCDB -lSTEERBase \
+                         -lACORDEbase -lSTEER -lCDB -lSTEERBase \
                          -lRAWDatabase \
                          -L$(shell root-config --libdir) -lVMC -lGeom
 endif

diff --git a/build/module.dep b/build/module.dep
index ea5e77251e0380585d74d420be08042bda6633e3..4ddf0183793acc5ae55c77ea8d3de1fb1433607e 100644 (file)
--- a/build/module.dep
+++ b/build/module.dep
@@ -107,9 +107,9 @@ $(LIBPATH)/libTOFsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libST
 $(LIBPATH)/libTOFrec.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libTOFbase.$(SOEXT)
 $(LIBPATH)/libpythia6.$(SOEXT): $(LIBPATH)/libmicrocern.$(SOEXT) $(LIBPATH)/liblhapdf.$(SOEXT)
 $(LIBPATH)/libAliPythia6.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libpythia6.$(SOEXT) $(LIBPATH)/libEVGEN.$(SOEXT) $(LIBPATH)/libFASTSIM.$(SOEXT)
-$(LIBPATH)/libACORDEbase.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT)
-$(LIBPATH)/libACORDErec.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT)
-$(LIBPATH)/libACORDEsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libACORDErec.$(SOEXT) $(LIBPATH)/libACORDEbase.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT)
+$(LIBPATH)/libACORDEbase.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT)
+$(LIBPATH)/libACORDErec.$(SOEXT): $(LIBPATH)/libACORDEbase.$(SOEXT) $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT)
+$(LIBPATH)/libACORDEsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libACORDEbase.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT)
 $(LIBPATH)/libZDCbase.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatarec.$(SOEXT)
 $(LIBPATH)/libZDCsim.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libRAWDatabase.$(SOEXT) $(LIBPATH)/libZDCbase.$(SOEXT)
 $(LIBPATH)/libZDCrec.$(SOEXT): $(LIBPATH)/libSTEERBase.$(SOEXT) $(LIBPATH)/libESD.$(SOEXT) $(LIBPATH)/libCDB.$(SOEXT) $(LIBPATH)/libSTEER.$(SOEXT) $(LIBPATH)/libZDCbase.$(SOEXT)