--- DarthVader/CalorimeterLevel2/Makefile	2006/12/15 14:41:53	1.13
+++ DarthVader/CalorimeterLevel2/Makefile	2008/04/10 11:41:44	1.36
@@ -1,6 +1,6 @@
 # Calorimeter flight analysis software 
 # SOFTWARE VERSION
-VER= v4r02
+VER= v5r02
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some usefull definition for colorize the echo 
 RED='\E[1;31;40m'
@@ -24,7 +24,7 @@
 # C
 CC=gcc
 #CFLAGS=-Wall -O -fPIC -pthread -g
-CFLAGS=-Wall -O -fPIC -pthread
+CFLAGS=-Wall -O4 -fPIC -pthread
 # Enviroment:
 GCCVER=`gcc --version | head -1`
 UNAMEA=`uname -a`
@@ -36,7 +36,7 @@
 # C++
 CXX=g++
 #CXXFLAGS=-Wall -O -fPIC -pthread -g
-CXXFLAGS=-Wall -O -fPIC -pthread
+CXXFLAGS=-Wall -O4 -fPIC -pthread
 # ROOTCINT
 ROOTCINT=rootcint
 # Here the variables definig the local directories
@@ -61,8 +61,10 @@
       ${DIRSRC}/nshower.for \
       ${DIRSRC}/nointer.for \
       ${DIRSRC}/elio.for \
+      ${DIRSRC}/nuclei.for \
       ${DIRSRC}/cluster.for \
       ${DIRSRC}/cluster2.for \
+      ${DIRSRC}/cluster4.for \
       ${DIRSRC}/laterale.for \
       ${DIRSRC}/baric.for \
       ${DIRSRC}/selftrig.for \
@@ -79,20 +81,21 @@
 COBJS=$(CSRCS:${DIRSRC}%.c=${DIRLIB}%.o)
 
 # -- CPP - ROOT libraries --
-LIBROOTSRCS=${DIRSRC}/CaloLevel1.cpp \
+LIBROOTSRCS=${DIRSRC}/CaloLevel0.cpp \
+	    ${DIRSRC}/CaloLevel1.cpp \
 	    ${DIRSRC}/CaloLevel2.cpp
 
 LIBROOTLIBS=$(LIBROOTSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so)
-LIBROOTOBJS=${DIRLIB}/millim.o 
-LIBROOTCLIBS=libCaloLevel2 libCaloLevel1
+#LIBROOTOBJS=${DIRLIB}/millim.o 
+LIBROOTOBJS=${FOBJS} ${COBJS}
+LIBROOTCLIBS=libCaloLevel2 libCaloLevel1 libCaloLevel0
 FULLROOTCLIBS=$(LIBROOTCLIBS:%=${DIRLIB}/%_${VER}.so)
 
 # -- CPP - NON-ROOT libraries --
-LIBCPPSRCS=${DIRSRC}/CaloProcessing.cpp \
-	   ${DIRSRC}/CaloCore.cpp \
+LIBCPPSRCS=${DIRSRC}/CaloCore.cpp \
 	   ${DIRSRC}/CaloVerl2.cpp
 LIBCPPLIBS=$(LIBCPPSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so)
-LIBCPPCLIBS=libCaloProcessing libCaloCore libCaloVerl2
+LIBCPPCLIBS=libCaloCore libCaloVerl2
 FULLLIBCPPLIBS=$(LIBCPPCLIBS:%=${DIRLIB}/%_${VER}.so)
 
 # -- CPP - Executables --
@@ -113,7 +116,7 @@
 # Other objects to install
 EXESRCS=${DIRBIN}/CalorimeterLevel2
 
-INCSRCS=${DIRINC}/CaloLevel1.h ${DIRINC}/CaloLevel2.h ${DIRINC}/CaloStruct.h ${DIRINC}/CaloProcessing.h ${DIRINC}/CaloCore.h
+INCSRCS=${DIRINC}/CaloLevel0.h ${DIRINC}/CaloLevel1.h ${DIRINC}/CaloLevel2.h ${DIRINC}/CaloStruct.h ${DIRINC}/CaloCore.h ${DIRINC}/INTEST.TXT
 
 MACROSSRCS=
 
@@ -164,12 +167,12 @@
 	@(${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
 #
-	@${ROOTCINT} -f ${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp -c -I${ROOTINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ ${DIRINC}/`basename $(@F) _${VER}.so | sed s/lib//`.h ${DIRINC}/`basename $(@F) _${VER}.so | sed s/lib//`LinkDef.h
+	@${ROOTCINT} -f ${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp -c -I${DIRINC} -I${ROOTINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ ${DIRINC}/`basename $(@F) _${VER}.so | sed s/lib//`.h ${DIRINC}/`basename $(@F) _${VER}.so | sed s/lib//`LinkDef.h
 #
 #	create .o 
 #