--- DarthVader/TrackerLevel2/Makefile 2014/01/17 10:14:36 1.54 +++ DarthVader/TrackerLevel2/Makefile 2014/10/15 08:45:50 1.68 @@ -1,6 +1,6 @@ # Tracker flight analysis software # SOFTWARE VERSION -VER= v6r10 +VER= v7r12 DEBUG=0 # include ../Make.def @@ -53,7 +53,8 @@ ${DIRSRC}/F77/interB.f \ ${DIRSRC}/F77/track.f \ ${DIRSRC}/F77/grkuta.f \ - ${DIRSRC}/F77/bdll.f # ***PP*** + ${DIRSRC}/F77/bdll.f \ + ${DIRSRC}/F77/mini_ext.f FOBJS=$(FSRCS:${DIRSRC}/F77/%.f=${DIRLIB}/%.o) #------------------------------------------------- @@ -66,7 +67,8 @@ ${DIRSRC}/TrkLevel1.cpp \ ${DIRSRC}/TrkLevel0.cpp \ ${DIRSRC}/TrkHough.cpp \ - ${DIRSRC}/TrkCalib.cpp + ${DIRSRC}/TrkCalib.cpp \ + ${DIRSRC}/ExtTrack.cpp #LIBROOTSRCS= LIBROOTLIBS=$(LIBROOTSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so) @@ -86,7 +88,7 @@ ${DIRLIB}/cncomp.o \ ${DIRLIB}/filladc.o \ ${DIRLIB}/reductionflight.o -LIBROOTCLIBS= libTrkParams libTrkLevel2 libTrkLevel1 libTrkLevel0 libTrkHough libTrkCalib +LIBROOTCLIBS= libTrkParams libTrkLevel2 libTrkLevel1 libTrkLevel0 libTrkHough libTrkCalib libExtTrack #LIBROOTCLIBS= FULLROOTCLIBS=$(LIBROOTCLIBS:%=${DIRLIB}/%_${VER}.so) @@ -98,11 +100,12 @@ ${DIRSRC}/TrkProcess.cpp \ ${DIRSRC}/TrkVerl2.cpp \ ${DIRSRC}/TrkCore.cpp \ + ${DIRSRC}/ExtTrkingAlg.cpp \ # ${DIRSRC}/TrkLevel0.cpp LIBCPPLIBSTRK=$(LIBCPPSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so) #LIBCPPCLIBS=libTrkLevel2 libTrkLevel0 -LIBCPPCLIBS= libTrkStruct libTrkProcess libTrkCore libTrkVerl2 #libTrkLevel0 +LIBCPPCLIBS= libTrkStruct libTrkProcess libTrkCore libTrkVerl2 libExtTrkingAlg #libTrkLevel0 FULLCPPCLIBS=$(LIBCPPCLIBS:%=${DIRLIB}/%_${VER}.so) #------------------------------------------------- # librerie F77 NON utilizzabili da root @@ -128,6 +131,8 @@ # variabili per l'installazione EXESRCS=${DIRBIN}/TrackerLevel2 INCSRCS= \ + ${DIRINC}/ExtTrack.h \ + ${DIRINC}/ExtTrkingAlg.h \ ${DIRINC}/TrkLevel2.h \ ${DIRINC}/TrkLevel1.h \ ${DIRINC}/TrkLevel0.h \