--- DarthVader/CalorimeterLevel2/Makefile 2007/01/24 10:08:51 1.19 +++ DarthVader/CalorimeterLevel2/Makefile 2007/04/26 14:24:36 1.25 @@ -1,6 +1,6 @@ # Calorimeter flight analysis software # SOFTWARE VERSION -VER= v4r04 +VER= v4r09 # An almost general purpouse Makefile for PAMELA repository # Let's start with some usefull definition for colorize the echo RED='\E[1;31;40m' @@ -80,20 +80,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 -- @@ -114,7 +115,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 MACROSSRCS= @@ -165,7 +166,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