--- DarthVader/Makefile	2006/11/08 09:36:58	1.20
+++ DarthVader/Makefile	2007/02/16 18:01:33	1.30
@@ -1,6 +1,6 @@
 # DarthVader flight analysis software 
 # SOFTWARE VERSION IS
-VER= v2r00
+VER= v3r01
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some usefull definition for colorize the echo 
 RED='\E[1;31;40m'
@@ -34,13 +34,17 @@
 # F77
 F77=g77
 #F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash
-F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash
+F77FLAGS=  -Wall -Wno-globals -fPIC -fvxt -fno-automatic -fbounds-check -extend_source -static -fno-backslash
 # C++
 CXX=g++
 #CXXFLAGS=-Wall -O -fPIC -pthread -g
-CXXFLAGS=-Wall -O -fPIC -pthread
+CXXFLAGS=-Wall -O4 -fPIC -pthread
 # ROOTCINT
 ROOTCINT=rootcint
+#CERNLIB
+CERNLIB=./docs/cernlib_pam
+#CERNLIB=cernlib
+
 # Here the variables definig the local directories
 DIRTOP=${shell pwd}
 #DIRLIB=../lib/${ARCH}
@@ -109,7 +113,7 @@
 
 MACROSSRCS=
 
-CALIBFILES=${DIRCALIB}/trk-param ${DIRCALIB}/cal-param ${DIRCALIB}/tof-param
+CALIBFILES=${DIRCALIB}/trk-param ${DIRCALIB}/cal-param ${DIRCALIB}/tof-param ${DIRCALIB}/orb-param
 
 DOCFILES=
 
@@ -205,8 +209,9 @@
 
 ${CXXEXELIBS}: ${CPPOBJS} ${COBJS} ${CXXEXEOBJS}
 	@(${EGREEN} "Creating exec file: "${WHITE} "$@"; ${RESET})
-	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRTOP}/${DIRLIB}/$@.o ${OBJS} ${PAM_LIB}/libGLTables.so ${PAM_LIB}/libsgp4.so ${PAM_YODA}/lib/libyoda.so ${PAM_LIB}/libshift.so -lThread `root-config --cflags --glibs` `cernlib_noshift mathlib`
-	@${CXX} ${CXXFLAGS} -Xlinker -soname=libDarthVader_${VER}.so -shared -o ${DIRTOP}/${DIRLIB}/libDarthVader_${VER}.so -lg2c ${DIRTOP}/${DIRLIB}/libAcLevel2.so ${DIRTOP}/${DIRLIB}/libCaloLevel2.so  ${PAM_LIB}/libsgp4.so ${DIRTOP}/${DIRLIB}/libNDLevel2.so ${DIRTOP}/${DIRLIB}/libS4Level2.so ${DIRTOP}/${DIRLIB}/libToFLevel2.so ${DIRTOP}/${DIRLIB}/libTrigLevel2.so ${DIRTOP}/${DIRLIB}/libTrkLevel2.so ${DIRTOP}/${DIRLIB}/libTrkLevel1.so ${PAM_LIB}/libGLTables.so ${DIRTOP}/${DIRLIB}/libRunInfo.so ${DIRTOP}/${DIRLIB}/libOrbitalInfo.so  `cernlib mathlib` 
+	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRTOP}/${DIRLIB}/$@.o ${OBJS} ${PAM_LIB}/libGLTables.so ${PAM_LIB}/libsgp4.so ${PAM_YODA}/lib/libyoda.so -lThread `root-config --cflags --glibs` `${CERNLIB} mathlib`
+	@${CXX} ${CXXFLAGS} -Xlinker -soname=libDarthVader_${VER}.so -shared -o ${DIRTOP}/${DIRLIB}/libDarthVader_${VER}.so -lg2c ${DIRTOP}/${DIRLIB}/libAcLevel2.so ${DIRTOP}/${DIRLIB}/libCaloLevel1.so ${DIRTOP}/${DIRLIB}/libCaloLevel2.so  ${PAM_LIB}/libsgp4.so ${DIRTOP}/${DIRLIB}/libNDLevel2.so ${DIRTOP}/${DIRLIB}/libS4Level2.so ${DIRTOP}/${DIRLIB}/libToFLevel2.so ${DIRTOP}/${DIRLIB}/libTrigLevel2.so ${DIRTOP}/${DIRLIB}/libTrkLevel2.so ${DIRTOP}/${DIRLIB}/libTrkLevel1.so ${DIRTOP}/${DIRLIB}/libTrkLevel0.so ${DIRTOP}/${DIRLIB}/libTrkHough.so  ${DIRTOP}/${DIRLIB}/libTrkCalib.so ${DIRTOP}/${DIRLIB}/libTrkParams.so ${PAM_LIB}/libGLTables.so ${DIRTOP}/${DIRLIB}/libRunInfo.so ${DIRTOP}/${DIRLIB}/libOrbitalInfo.so  `${CERNLIB} mathlib` 
+
 #	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRTOP}/${DIRLIB}/$@.o ${OBJS} ${PAM_YODA}/lib/libyoda.so ${PAM_YODA}/lib/libutils.so -lThread `root-config --cflags --glibs` `cernlib mathlib`
 
 # A small target to check environmental variables
@@ -265,6 +270,15 @@
 locupgrade: FORCE=-u
 locupgrade: locinstall
 
+upgradenc: 
+	@for dir in `echo ${SUBDIR}`; do  \
+	 echo "Making upgrade in $${dir}"; \
+	 (cd $${dir} && ${MAKE} upgrade); \
+	done; make locupgradenc
+
+locupgradenc: FORCE=-u
+locupgradenc: locinstallnc
+
 install: 
 	@for dir in `echo ${SUBDIR}`; do  \
 	 echo "Making install in $${dir}"; \
@@ -273,6 +287,8 @@
 
 locinstall: installlib installinc installmacros installcalib installdoc installexe installcmacro
 
+locinstallnc: installlib installinc installmacros installdoc installexe installcmacro
+
 installlib: LINK=y
 installlib: TOBEMOVED= $(FULLLIBS:${DIRLIB}%=${PAM_LIB}%)
 installlib: ORIGIN=${DIRLIB}