--- DarthVader/RunInfo/Makefile	2006/05/19 13:15:47	1.1.1.1
+++ DarthVader/RunInfo/Makefile	2007/01/12 08:06:26	1.9
@@ -1,6 +1,6 @@
 # RunInfo software 
 # SOFTWARE VERSION
-VER= v1r02
+VER= v1r04
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some usefull definition for colorize the echo 
 RED='\E[1;31;40m'
@@ -32,11 +32,11 @@
 # 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
 # Here the variables definig the local directories
@@ -51,8 +51,9 @@
 # Here the  PAMELA environmental variables to be checked
 PAM_ENV= PAM_BIN_env PAM_LIB_env PAM_INC_env PAM_DOC_env 
 #
-SUBDIR=../GLTables 
-SUBINC=$(shell for dir in `echo ${SUBDIR}`; do echo -I$${dir}/inc; done)
+SUBDIR=
+SUBINC=-I${PAM_YODA}/include/yoda/ -I${PAM_INC}/
+#SUBINC=$(shell for dir in `echo ${SUBDIR}`; do echo -I$${dir}/inc; done)
 
 # Here the local variables used to build the targets
 # -- F77 - no libraries --
@@ -88,15 +89,15 @@
 CXXEXELIBS=RunInfoLevel2
 
 # Other needed libraries
-OTHOBJS = ${DIRLIB}/libGLTables.so
+OTHOBJS = ${PAM_LIB}/libGLTables.so
 
 # List of all libraries we want to install
 FULLLIBS = ${FULLROOTCLIBS} ${FULLLIBCPPLIBS}
 
 # Other objects to install
-EXESRCS=${DIRBIN}/RunInfo
+EXESRCS=${DIRBIN}/RunInfoLevel2
 
-INCSRCS=${DIRINC}/RunInfo.h ${DIRINC}/RunInfoCore.h
+INCSRCS=${DIRINC}/RunInfo.h ${DIRINC}/RunInfoCore.h ${DIRINC}/RunInfoStruct.h 
 
 MACROSSRCS=
 
@@ -141,7 +142,7 @@
 
 ${DIRLIB}/%.o: ${DIRSRC}/%.c
 	@(${EGREEN} "Creating C object file: "${WHITE} "`basename $@`"; ${RESET})
-	@${CXX} ${CXXFLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.c -I${DIRINC} -I${SUBINC} `root-config --cflags`
+	@${CXX} ${CXXFLAGS} -c -o $@ ${DIRSRC}/`basename ${@} .o`.c -I${DIRINC} ${SUBINC} `root-config --cflags`
 
 ${DIRLIB}/%.o: ${DIRSRC}/%.for
 	@(${EGREEN} "Creating F77 object file: "${WHITE} "`basename $@`"; ${RESET})
@@ -314,12 +315,12 @@
      else \
        ${EYELLOW} " Forcing copy: "${WHITE} ${ORIGIN}/$${i##/*/} ;\
        ${EYELLOW} "          to: "${WHITE} $${i} ; ${RESET}; \
-       cp -f ${ORIGIN}/$${i##/*/} $${i}; \
+       cp -rf ${ORIGIN}/$${i##/*/} $${i}; \
      fi; \
    else \
      ${EYELLOW} " Forcing copy: "${WHITE} ${ORIGIN}/$${i##/*/} ;\
      ${EYELLOW} "          to: "${WHITE} $${i} ; ${RESET}; \
-     cp ${FORCE} ${ORIGIN}/$${i##/*/} $${i}; \
+     cp -rf ${FORCE} ${ORIGIN}/$${i##/*/} $${i}; \
    fi;\
 fi ;\
 if [ ! -z ${LINK} ] ; then \