--- DarthVader/RunInfo/Makefile	2006/05/19 14:36:38	1.2
+++ DarthVader/RunInfo/Makefile	2006/09/04 15:43:49	1.4
@@ -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,7 +89,7 @@
 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}
@@ -96,7 +97,7 @@
 # Other objects to install
 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})