Version 1.49 and 1.48 merged

diff --git a/PHOS/Makefile b/PHOS/Makefile
index 4119e28fca1dd0b18b45e094d558005be24170ac..2f1abcaa32e49a6fe208e9d835e446a994abc7bd 100644 (file)
--- a/PHOS/Makefile
+++ b/PHOS/Makefile
@@ -12,7 +12,7 @@ PACKAGE = PHOS
 SRCS          =  AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx \
                  AliPHOSvFast.cxx AliPHOSvImpacts.cxx \
                  AliPHOSImpact.cxx \
-                 AliPHOSHit.cxx AliPHOSTick.cxx\
+                 AliPHOSHit.cxx \
                  AliPHOSGeometry.cxx \
                 AliPHOSEMCAGeometry.cxx \
                 AliPHOSCPVGeometry.cxx AliPHOSCPVBaseGeometry.cxx \
@@ -29,7 +29,10 @@ SRCS          =  AliPHOS.cxx AliPHOSv0.cxx AliPHOSv1.cxx \
                  AliPHOSGetter.cxx AliPHOSTick.cxx \
                 AliPHOSQAVirtualCheckable.cxx AliPHOSQAIntCheckable.cxx \
                  AliPHOSQAFloatCheckable.cxx\
-                 AliPHOSQAObjectCheckable.cxx AliPHOSQAChecker.cxx AliPHOSQAMeanChecker.cxx AliPHOSQAAlarm.cxx
+                 AliPHOSQAObjectCheckable.cxx AliPHOSQAChecker.cxx AliPHOSQAMeanChecker.cxx AliPHOSQAAlarm.cxx \
+                 AliPHOSIhepAnalyze.cxx AliPHOSEvalRecPoint.cxx \
+                 AliPHOSRecManager.cxx AliPHOSRecCpvManager.cxx AliPHOSRecEmcManager.cxx \
+                 AliPHOSClusterizerv2.cxx
 
 # C++ Headers