--- DarthVader/TrackerLevel2/Makefile	2014/01/16 15:29:38	1.53
+++ DarthVader/TrackerLevel2/Makefile	2014/07/03 10:37:57	1.59
@@ -1,6 +1,6 @@
 # Tracker flight analysis software 
 # SOFTWARE VERSION
-VER= v6r09
+VER= v7r02
 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
  
-LIBCPPLIBS=$(LIBCPPSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so)
+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 \
@@ -155,7 +160,7 @@
 NROOTINC=${shell root-config --incdir}
 # Let's start
 #all : test mkbindir mklibdir mkverpath ${LIBF77LIBS} ${LIBROOTLIBS} ${LIBCPPLIBS} ${FOBJS} ${COBJS} ${CXXEXELIBS} 
-all : test mkbindir mklibdir mkverpath ${LIBF77LIBS} ${LIBROOTLIBS} ${LIBCPPLIBS}
+all : test mkbindir mklibdir mkverpath ${LIBF77LIBS} ${LIBROOTLIBS} ${LIBCPPLIBSTRK}
 all: 
 #	@echo -e ${GREEN} ""
 #	@(${EGREEN} " Finished, now you can install the package \n  (use: make install or make upgrade or make forceinstall) "; ${RESET})
@@ -170,6 +175,20 @@
 	@(${EGREEN} "Creating tracker F77 object file: "${WHITE} "$@"; ${RESET})
 	@${F77} ${F77FLAGS} -c -o $@ ${DIRSRC}/F77/`basename ${@} .o`.f -I${DIRTOP}/${DIRINC}/F77 -I${NROOTINC} ${SUBINC} -I${PAM_YODA}/include/yoda -I${PAM_INC}/ 
 
+
+${LIBCPPLIBSTRK}: ${LIBSRCS} ${COBJS} ${FOBJS}
+#
+#	create .o 
+#
+	@(${EGREEN} "Compiling CPP file: "${WHITE} "`basename $(@F) _${VER}.so | sed s/lib//`.cpp"; ${RESET})
+	@${CXX} ${CXXFLAGS} -c ${DIRTOP}/${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`.cpp -o ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`.o -I${DIRTOP}/${DIRINC} -I${DIRTOP} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${PAM_INC}/ -I${NROOTINC} -I${DIRTOP}/../CalorimeterLevel2/inc  -I${DIRTOP}/../ToFLevel2/inc -I${DIRTOP}/../TriggerLevel2/inc -I${DIRTOP}/../OrbitalInfo/inc
+#
+#	create .so
+#
+	@(${EGREEN} "Creating shared library: "${WHITE} "`basename $@`"; ${RESET})
+	@${CXX} ${CXXFLAGS} -Xlinker -soname=$(@F) -shared -o $@ $(LG2C) ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`.o ${FOBJS} ${COBJS} 1>/dev/null
+	@ln -sf  ${DIRTOP}/${DIRLIB}/$(@F) ${DIRTOP}/${DIRLIB}/$(patsubst %_${VER}.so,%.so,$(@F))
+
 # A small target to check environmental variables
 %_env:
 	@${test_env}