--- DarthVader/CalorimeterLevel2/Makefile	2007/03/18 20:22:49	1.20
+++ DarthVader/CalorimeterLevel2/Makefile	2008/12/12 16:18:13	1.41
@@ -1,6 +1,6 @@
 # Calorimeter flight analysis software 
 # SOFTWARE VERSION
-VER= v4r05
+VER= v6r00
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some usefull definition for colorize the echo 
 RED='\E[1;31;40m'
@@ -23,20 +23,24 @@
 # Here the variables used to override the standard make flags
 # C
 CC=gcc
-#CFLAGS=-Wall -O -fPIC -pthread -g
-CFLAGS=-Wall -O4 -fPIC -pthread
+#CFLAGS=-Wall -O -fPIC -pthread -g ${PAM_BIT} 
+CFLAGS=-Wall -O3 -funroll-loops -fPIC -pthread ${PAM_BIT} 
+#CFLAGS=-Wall -O4 -fPIC -pthread ${PAM_BIT} 
 # Enviroment:
 GCCVER=`gcc --version | head -1`
 UNAMEA=`uname -a`
 TODAY=`date`
 # F77
 F77=g77
-#F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash
-F77FLAGS=  -Wall -Wno-globals -fPIC -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash
+#F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash ${PAM_BIT} 
+#F77FLAGS= -fforce-addr -funroll-all-loops -ffinite-math-only -Wall -funroll-loops -Wno-globals -fPIC -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT} 
+F77FLAGS= -O1 -fforce-addr -funroll-all-loops -ffinite-math-only -Wall -funroll-loops -Wno-globals -fPIC -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT} 
+#F77FLAGS= -Wall -Wno-globals -fPIC -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT} 
 # C++
 CXX=g++
-#CXXFLAGS=-Wall -O -fPIC -pthread -g
-CXXFLAGS=-Wall -O4 -fPIC -pthread
+#CXXFLAGS=-Wall -O -fPIC -pthread -g ${PAM_BIT} 
+CXXFLAGS=-Wall -O3 -funroll-loops -fPIC -pthread ${PAM_BIT} 
+#CXXFLAGS=-Wall -fPIC -pthread ${PAM_BIT} 
 # ROOTCINT
 ROOTCINT=rootcint
 # Here the variables definig the local directories
@@ -64,6 +68,7 @@
       ${DIRSRC}/nuclei.for \
       ${DIRSRC}/cluster.for \
       ${DIRSRC}/cluster2.for \
+      ${DIRSRC}/cluster4.for \
       ${DIRSRC}/laterale.for \
       ${DIRSRC}/baric.for \
       ${DIRSRC}/selftrig.for \
@@ -115,7 +120,7 @@
 # Other objects to install
 EXESRCS=${DIRBIN}/CalorimeterLevel2
 
-INCSRCS=${DIRINC}/CaloLevel0.h ${DIRINC}/CaloLevel1.h ${DIRINC}/CaloLevel2.h ${DIRINC}/CaloStruct.h ${DIRINC}/CaloCore.h
+INCSRCS=${DIRINC}/CaloLevel0.h ${DIRINC}/CaloLevel1.h ${DIRINC}/CaloLevel2.h ${DIRINC}/CaloStruct.h ${DIRINC}/CaloCore.h ${DIRINC}/INTEST.TXT
 
 MACROSSRCS=
 
@@ -166,7 +171,7 @@
 	@(${EGREEN} "Creating F77 object file: "${WHITE} "`basename $@`"; ${RESET})
 	@${F77} ${F77FLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.for -I${DIRINC} 
 
-${LIBROOTLIBS}: ${LIBROOTSRCS} ${FOBJS}
+${LIBROOTLIBS}: ${LIBROOTSRCS} ${COBJS} ${FOBJS} 
 	@(${EGREEN} "ROOTCINT - creating file: "${WHITE} "`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp"; ${RESET})
 #
 #	Create *Dict.cpp and *Dict.h