--- DarthVader/Makefile	2006/05/19 13:15:25	1.1.1.1
+++ DarthVader/Makefile	2006/05/31 11:24:38	1.4
@@ -82,14 +82,16 @@
 FULLLIBCPPLIBS=$(LIBCPPCLIBS:%=${DIRLIB}/%_${VER}.so)
 
 # -- CPP - Executables --
-CXXEXESRCS=${DIRSRC}/DarthVader.cpp
+CXXEXESRCS=${DIRSRC}/DarthVader.cpp \
+	   ${DIRSRC}/R2-D2.cpp
 CXXEXEOBJS=$(CXXEXESRCS:${DIRSRC}%.cpp=${DIRLIB}%.o)
-CXXEXELIBS:=DarthVader
+CXXEXELIBS:=DarthVader R2-D2
 
 # -- 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}/* 
+#OBJS=${DIRLIB}/*.*
+OBJS=$(shell cd ${DIRLIB}&>/dev/null;for file in `ls *.*`; do if [ $${file} != "" ] && [ $${file} != "DarthVader.o" ] && [ $${file} != "R2-D2.o" ]; then echo ${DIRLIB}/$${file}; fi; done)
 #TRKOBJS=
 
 # -- directory where to find tracker headers needed to compile
@@ -104,7 +106,7 @@
 FULLLIBS = ${FULLROOTCLIBS} ${FULLLIBCPPLIBS}
 
 # Other objects to install
-EXESRCS=${DIRBIN}/DarthVader
+EXESRCS=${DIRBIN}/DarthVader ${DIRBIN}/R2-D2
 
 INCSRCS=
 
@@ -206,8 +208,7 @@
 
 ${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}/$@ ${DIRTOP}/${DIRLIB}/$@.o ${OBJS} ${PAM_YODA}/lib/libyoda.so -lThread `root-config --cflags --glibs` `cernlib mathlib`
 
 # A small target to check environmental variables
 %_env:
@@ -387,8 +388,8 @@
 wv=$${i##/*/}; \
 dest=$${i/$${wv}/}; \
 ${EYELLOW} " Copying directory: "${WHITE} ${ORIGIN}/$${i##/*/} ;\
-${EYELLOW} "          to: "${WHITE} $${i} ; ${RESET}; \
-cp -rf ${ORIGIN}/$${i##/*/} $${i}; \
+${EYELLOW} "          to: "${WHITE} ${PAM_CALIB} ; ${RESET}; \
+cp -rf ${ORIGIN}/$${i##/*/} ${PAM_CALIB}; \
 done
 endef