--- DarthVader/Makefile	2006/05/19 13:15:25	1.1.1.1
+++ DarthVader/Makefile	2006/06/17 12:12:48	1.1.1.2
@@ -1,6 +1,6 @@
-# DarthVader flight analysis software 
+# Trigger flight analysis software 
 # SOFTWARE VERSION
-VER= v0r01
+VER= v3r00
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some usefull definition for colorize the echo 
 RED='\E[1;31;40m'
@@ -21,8 +21,6 @@
 # Reset the terminal
 RESET=tput sgr0
 # Here the variables used to override the standard make flags
-#MAKE
-MAKE=make 
 # C
 CC=gcc
 #CFLAGS=-Wall -O -fPIC -pthread -g
@@ -43,17 +41,17 @@
 ROOTCINT=rootcint
 # Here the variables definig the local directories
 DIRTOP=${shell pwd}
-#DIRLIB=../lib/${ARCH}
-#DIRBIN=../bin/${ARCH}
-DIRLIB=lib/${ARCH}
-DIRBIN=bin/${ARCH}
+DIRLIB=../lib/${ARCH}
+DIRBIN=../bin/${ARCH}
+#DIRLIB=lib/${ARCH}
+#DIRBIN=bin/${ARCH}
 DIRSRC=src
 DIRINC=inc
 DIRDOC=doc
 DIRMACROS=macros
-DIRCALIB=param
+DIRCALIB=calib
 # Here the  PAMELA environmental variables to be checked
-PAM_ENV= PAM_BIN_env PAM_LIB_env PAM_INC_env PAM_DOC_env PAM_CALIB_env PAM_YODA_env 
+PAM_ENV= PAM_BIN_env PAM_LIB_env PAM_INC_env PAM_DOC_env PAM_YODA_env 
 
 # Here the local variables used to build the targets
 # -- F77 - no libraries --
@@ -61,61 +59,54 @@
 FOBJS=$(FSRCS:${DIRSRC}%.for=${DIRLIB}%.o)
 
 # -- CPP - no libraries --
-CPPSRCS=${DIRSRC}/DarthVaderVerl2.cpp
+CPPSRCS=
 CPPOBJS=$(CPPSRCS:${DIRSRC}%.cpp=${DIRLIB}%.o)
 
 # -- C - no libraries --
-CSRCS=
+CSRCS= 
 COBJS=$(CSRCS:${DIRSRC}%.c=${DIRLIB}%.o)
 
 # -- CPP - ROOT libraries --
-LIBROOTSRCS=
+LIBROOTSRCS=${DIRSRC}/TrigLevel2.cpp 
 
 LIBROOTLIBS=$(LIBROOTSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so)
-LIBROOTCLIBS=
+LIBROOTCLIBS=libTrigLevel2 
 FULLROOTCLIBS=$(LIBROOTCLIBS:%=${DIRLIB}/%_${VER}.so)
 
 # -- CPP - NON-ROOT libraries --
-LIBCPPSRCS=
+LIBCPPSRCS= ${DIRSRC}/TrigCore.cpp \
+	${DIRSRC}/TrigVerl2.cpp
 LIBCPPLIBS=$(LIBCPPSRCS:${DIRSRC}/%.cpp=${DIRLIB}/lib%_${VER}.so)
-LIBCPPCLIBS=
+LIBCPPCLIBS=libTrigCore libTrigVerl2
 FULLLIBCPPLIBS=$(LIBCPPCLIBS:%=${DIRLIB}/%_${VER}.so)
 
 # -- CPP - Executables --
-CXXEXESRCS=${DIRSRC}/DarthVader.cpp
+CXXEXESRCS=${DIRSRC}/TriggerLevel2.cpp
 CXXEXEOBJS=$(CXXEXESRCS:${DIRSRC}%.cpp=${DIRLIB}%.o)
-CXXEXELIBS:=DarthVader
+CXXEXELIBS:=TriggerLevel2
 
 # -- list of tracker objects needed to link
-#TRKOBJS=${DIRTOP}/../lib2/libTrkLevel2.so ${DIRTOP}/../lib2/libtrack.so
-#TRKOBJS=$(shell for lib in `ls ${DIRLIB}`; do echo ${lib}; done)
-OBJS=${DIRLIB}/* 
-#TRKOBJS=
-
+TRKOBJS=${DIRLIB}/libGLTables.so ${DIRLIB}/libRunInfo.so
 # -- directory where to find tracker headers needed to compile
-#TRKHEAD=${DIRTOP}/../tracker/inc
-#TRKHEAD=-I${PAM_INC} -ITrackerLevel2/inc/ -IRunInfo/inc/ -IGLTables/inc/
-
-#
-SUBDIR=./GLTables ./RunInfo ./S4Level2 ./NDLevel2 ./TrackerLevel2 ./TriggerLevel2 ./ToFLevel2 ./CalorimeterLevel2 ./AnticounterLevel2 ./OrbitalInfo
+SUBDIR=../GLTables ../RunInfo 
 SUBINC=$(shell for dir in `echo ${SUBDIR}`; do echo -I$${dir}/inc; done)
 
 # List of all libraries we want to install
 FULLLIBS = ${FULLROOTCLIBS} ${FULLLIBCPPLIBS}
 
 # Other objects to install
-EXESRCS=${DIRBIN}/DarthVader
+EXESRCS=${DIRBIN}/TriggerLevel2
 
-INCSRCS=
+INCSRCS=${DIRINC}/TrigLevel2.h 
 
 MACROSSRCS=
 
-CALIBFILES=${DIRCALIB}/trk-param ${DIRCALIB}/cal-param ${DIRCALIB}/tof-param
+CALIBFILES=
 
 DOCFILES=
 
 # Here the Variables used for info target
-PACKAGE=PAMELA analysis flight software 
+PACKAGE=Trigger analysis flight software 
 EXECUTABLES= ${EXESRCS}
 LIBS= ${FULLLIBS}
 DOCS=
@@ -127,30 +118,16 @@
 TOBEDEL = junk
 ROOTINC=$$${shell root-config --incdir}
 NROOTINC=${shell root-config --incdir}
-# Directories where you place detectors software
-#SUBDIR=./GLTables ./RunInfo ./TrackerLevel2 ./CalorimeterLevel2
-
 # Let's start
 #all: test mkbindir mklibdir mkverpath ${FOBJS} ${CPPOBJS} ${LIBROOTLIBS} ${LIBCPPLIBS} ${CXXEXELIBS} 
-
+all: prepare libs 
 all: 
-	@for dir in `echo ${SUBDIR}`; do  \
-	 echo "Making all in $${dir}"; \
-	 (cd $${dir} && ${MAKE} all); \
-	done; make locall 
-
-locall: prepare libs exe
-locall: 
 	@echo -e ${GREEN} ""
 	@(${EGREEN} " Finished, now you can install the package \n  (use: make install or make upgrade or make forceinstall) "; ${RESET})
 	@echo -e ${GREEN} ""
 	@${RESET}
 
-#subdir:
-#	@for dir in `echo ${SUBDIR}`; do  \
-#	 echo "Making ${target} in $${dir}"; \
-#	 (cd $${dir} && ${MAKE} ${target}); \
-#	 done;
+standalone: all exe
 
 prepare: test mkbindir mklibdir mkverpath
 
@@ -161,11 +138,11 @@
 # Here some general rules to produce objects in our local dir
 ${DIRLIB}/%.o: ${DIRSRC}/%.cpp
 	@(${EGREEN} "Creating CPP object file: "${WHITE} "`basename $@`"; ${RESET})
-	@${CXX} ${CXXFLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.cpp -I${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ `root-config --cflags`
+	@${CXX} ${CXXFLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.cpp -I${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/  -I${PAM_YODA}/include/utils/ `root-config --cflags`
 
 ${DIRLIB}/%.o: ${DIRSRC}/%.c
 	@(${EGREEN} "Creating C object file: "${WHITE} "`basename $@`"; ${RESET})
-	@${CXX} ${CXXFLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.c -I${DIRINC}  -I${PAM_YODA}/include/yoda/ `root-config --cflags`
+	@${CXX} ${CXXFLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.c -I${DIRINC} ${SUBINC} -I${PAM_YODA}/include/yoda/ `root-config --cflags`
 
 ${DIRLIB}/%.o: ${DIRSRC}/%.for
 	@(${EGREEN} "Creating F77 object file: "${WHITE} "`basename $@`"; ${RESET})
@@ -181,14 +158,14 @@
 #	create .o 
 #
 	@(${EGREEN} "Compiling CPP file: "${WHITE} "`basename $(@F) _${VER}.so | sed s/lib//`.cpp"; ${RESET})
-	@cd ${DIRSRC} &>/dev/null && ${CXX} ${CXXFLAGS} -c `basename $(@F) _${VER}.so | sed s/lib//`.cpp -I${DIRTOP}/${DIRINC} -I${DIRTOP} -I${PAM_YODA}/include/yoda/ -I${NROOTINC}; 
+	@${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${NROOTINC}; 
 	@(${EGREEN} "Compiling CPP file: "${WHITE} "`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp"; ${RESET})
-	@cd ${DIRSRC} &>/dev/null && ${CXX} ${CXXFLAGS} -c `basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp -I${DIRTOP}/${DIRINC} -I${DIRTOP} -I${PAM_YODA}/include/yoda/ -I${NROOTINC}; 
+	@${CXX} ${CXXFLAGS} -c ${DIRTOP}/${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.cpp -o ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.o -I${DIRTOP}/${DIRINC} -I${DIRTOP} ${SUBINC} -I${PAM_YODA}/include/yoda/ -I${NROOTINC}; 
 #
 #	create .so
 #
 	@(${EGREEN} "Creating shared library: "${WHITE} "`basename $@`"; ${RESET})
-	@${CXX} ${CXXFLAGS} -Xlinker -soname=$(@F) -shared -o $@ -lg2c -I${DIRTOP}/${DIRINC} -I${DIRTOP} -I${PAM_YODA}/include/yoda/ ${DIRTOP}/${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`.o ${DIRTOP}/${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.o 1>/dev/null
+	@${CXX} ${CXXFLAGS} -Xlinker -soname=$(@F) -shared -o $@ -lg2c -I${DIRTOP}/${DIRINC} -I${DIRTOP} -I${PAM_YODA}/include/yoda/ ${SUBINC} ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`.o ${DIRTOP}/${DIRLIB}/`basename $(@F) _${VER}.so | sed s/lib//`Dict.o 1>/dev/null
 	@ln -sf  ${DIRTOP}/${DIRLIB}/$(@F) ${DIRTOP}/${DIRLIB}/$(patsubst %_${VER}.so,%.so,$(@F))
 
 ${LIBCPPLIBS}: ${LIBSRCS} ${COBJS} ${FOBJS}
@@ -196,18 +173,17 @@
 #	create .o 
 #
 	@(${EGREEN} "Compiling CPP file: "${WHITE} "`basename $(@F) _${VER}.so | sed s/lib//`.cpp"; ${RESET})
-	@cd ${DIRSRC} &>/dev/null && ${CXX} ${CXXFLAGS} -c `basename $(@F) _${VER}.so | sed s/lib//`.cpp -I${DIRTOP}/${DIRINC} -I${DIRTOP} -I${PAM_YODA}/include/yoda/ -I${NROOTINC} ${SUBINC}; 
+	@${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${NROOTINC}; 
 #
 #	create .so
 #
 	@(${EGREEN} "Creating shared library: "${WHITE} "`basename $@`"; ${RESET})
-	@${CXX} ${CXXFLAGS} -Xlinker -soname=$(@F) -shared -o $@ -lg2c -I${DIRTOP}/${DIRINC} -I${DIRTOP} -I${SUBINC} -I${PAM_YODA}/include/yoda/ ${DIRTOP}/${DIRSRC}/`basename $(@F) _${VER}.so | sed s/lib//`.o ${FOBJS} ${COBJS} 1>/dev/null
+	@${CXX} ${CXXFLAGS} -Xlinker -soname=$(@F) -shared -o $@ -lg2c -I${DIRTOP}/${DIRINC} -I${DIRTOP} ${SUBINC} -I${PAM_YODA}/include/yoda/ ${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))
 
 ${CXXEXELIBS}: ${CPPOBJS} ${COBJS} ${CXXEXEOBJS}
 	@(${EGREEN} "Creating exec file: "${WHITE} "$@"; ${RESET})
-#	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRLIB}/$@.o ${FULLROOTCLIBS} ${FULLLIBCPPLIBS} ${CPPOBJS} ${FOBJS} ${TRKOBJS} ${PAM_YODA}/lib/libyoda.so -I${DIRINC} -I${PAM_INC} -I${PAM_YODA}/include/yoda/ -lThread `root-config --cflags --glibs` `cernlib mathlib`
-	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${OBJS} ${PAM_YODA}/lib/libyoda.so -lThread `root-config --cflags --glibs` `cernlib mathlib`
+	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRLIB}/$@.o ${FULLROOTCLIBS} ${FULLLIBCPPLIBS} ${TRKOBJS} ${CPPOBJS} ${COBJS} ${FOBJS} ${PAM_YODA}/lib/libyoda.so -lThread `root-config --cflags --glibs` `cernlib mathlib`
 
 # A small target to check environmental variables
 %_env:
@@ -225,53 +201,31 @@
 	@${test_and_mk}
 
 # Here what has to be deleted in clean target
-clean: 
-	@for dir in `echo ${SUBDIR}`; do  \
-	 echo "Making clean in $${dir}"; \
-	 (cd $${dir} && ${MAKE} clean); \
-	done; make locclean 
-
-locclean: TOBEDEL= ${DIRSRC}/*.o ${DIRSRC}/*Dict.cpp ${DIRSRC}/*Dict.h ${FOBJS} ${FULLLIBS} ${DIRBIN}/${CXXEXELIBS} ${CPPOBJS} ${CXXEXEOBJS} ${FULLLINKCLIBS} ${FULLMACROCLIBS} ${FULLLINKMACROCLIBS} ${DIRSRC}/DarthVaderVerl2.cpp
-locclean:
+clean: TOBEDEL= ${DIRSRC}/*.o ${DIRSRC}/*Dict.cpp ${DIRSRC}/*Dict.h ${FOBJS} ${FULLLIBS} ${DIRBIN}/${CXXEXELIBS} ${CPPOBJS} ${CXXEXEOBJS} ${FULLLINKCLIBS} ${FULLMACROCLIBS} ${FULLLINKMACROCLIBS} ${DIRSRC}/TrigVerl2.cpp
+clean:
 	@${test_and_rm}
 
-distclean: 
-	@for dir in `echo ${SUBDIR}`; do  \
-	 echo "Making distclean in $${dir}"; \
-	 (cd $${dir} && ${MAKE} distclean); \
-	done; make locdistclean 
-
-locdistclean: clean
-locdistclean: TOBEDEL= ${DIRBIN} ${DIRLIB}
-locdistclean:
+distclean: clean
+distclean: TOBEDEL= ${DIRBIN} ${DIRLIB}
+distclean:
 	@${test_and_rm}
 
 
-forceinstall: 
-	@for dir in `echo ${SUBDIR}`; do  \
-	 echo "Making forceinstall in $${dir}"; \
-	 (cd $${dir} && ${MAKE} forceinstall); \
-	done; make locforceinstall
-
-locforceinstall: FORCE=-f
-locforceinstall: install
-
-upgrade: 
-	@for dir in `echo ${SUBDIR}`; do  \
-	 echo "Making upgrade in $${dir}"; \
-	 (cd $${dir} && ${MAKE} upgrade); \
-	done; make locupgrade
-
-locupgrade: FORCE=-u
-locupgrade: locinstall
-
-install: 
-	@for dir in `echo ${SUBDIR}`; do  \
-	 echo "Making install in $${dir}"; \
-	 (cd $${dir} && ${MAKE} install); \
-	done; make locinstall
+forceinstall: FORCE=-f
+forceinstall: install
+
+forceinstallstandalone: FORCE=-f
+forceinstallstandalone: installstandalone
+
+upgrade: FORCE=-u
+upgrade: install
+
+upgradestandalone: FORCE=-u
+upgradestandalone: installstandalone
 
-locinstall: installlib installinc installmacros installcalib installdoc installexe installcmacro
+install: installlib installinc installmacros installcalib installdoc installcmacro
+
+installstandalone: install installexe
 
 installlib: LINK=y
 installlib: TOBEMOVED= $(FULLLIBS:${DIRLIB}%=${PAM_LIB}%)
@@ -303,7 +257,7 @@
 installcalib: TOBEMOVED= $(CALIBFILES:${DIRCALIB}/%=${PAM_CALIB}/%)
 installcalib: ORIGIN=${DIRCALIB}
 installcalib:
-	@${cp_dir}
+	@${test_and_cp}
 
 installdoc: TOBEMOVED= $(DOCFILES:${DIRDOC}/%=${PAM_DOC}/%)
 installdoc: ORIGIN=${DIRDOC}
@@ -311,7 +265,7 @@
 	@${test_and_cp}
 
 mkverpath:
-	@echo '#include <TSystem.h>' >  ${DIRTOP}/${DIRSRC}/DarthVaderVerl2.cpp; echo ' char *DarthVaderInfo(bool print){ if ( print ) printf("\nPAMELA Level2 flight package version: ${VER}\n\nCompiled on '${TODAY}' with: '${GCCVER}'\n\nOn: '${UNAMEA}'\n\n"); return("${VER}"); }' >>  ${DIRTOP}/${DIRSRC}/DarthVaderVerl2.cpp
+	@echo '#include <TSystem.h>' >  ${DIRTOP}/${DIRSRC}/TrigVerl2.cpp; echo ' char *TrigInfo(bool print){ if ( print ) printf("\nTrigger Level2 flight package version: ${VER}\n\nCompiled on '${TODAY}' with: '${GCCVER}'\n\nOn: '${UNAMEA}'\n\n"); return("${VER}"); }' >>  ${DIRTOP}/${DIRSRC}/TrigVerl2.cpp
 	@sleep 0.8
 
 
@@ -381,17 +335,6 @@
 done
 endef
 
-define 	cp_dir
-wd=`pwd`;\
-for i in ${TOBEMOVED} ; do \
-wv=$${i##/*/}; \
-dest=$${i/$${wv}/}; \
-${EYELLOW} " Copying directory: "${WHITE} ${ORIGIN}/$${i##/*/} ;\
-${EYELLOW} "          to: "${WHITE} $${i} ; ${RESET}; \
-cp -rf ${ORIGIN}/$${i##/*/} $${i}; \
-done
-endef
-
 define 	test_and_mk
 ${EGREEN} "Testing for :" ${WHITE} "$@"; ${RESET}
 test -d "$@" || \