--- DarthVader/CalorimeterLevel2/Makefile 2007/01/23 11:52:23 1.18 +++ DarthVader/CalorimeterLevel2/Makefile 2007/03/18 20:22:49 1.20 @@ -1,6 +1,6 @@ # Calorimeter flight analysis software # SOFTWARE VERSION -VER= v4r04 +VER= v4r05 # 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= @@ -170,7 +171,7 @@ # # 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 #