--- calo/flight/FQLOOK/Makefile	2006/03/13 14:49:30	1.3
+++ calo/flight/FQLOOK/Makefile	2006/03/20 11:52:32	1.4
@@ -1,6 +1,6 @@
 # Flight quick look - FQLOOK
 # SOFTWARE VERSION
-VER= v1r02
+VER= v1r03
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some usefull definition for colorize the echo 
 RED='\E[1;31;40m'
@@ -51,8 +51,8 @@
 
 MACROSRCS=${DIRMACROS}/FCaloQLOOK.cxx \
 	  ${DIRMACROS}/FCaloCHKCALIB.cxx 
-MACROSLIBS=$(MACROSRCS:${DIRMACROS}/%.cxx=${DIRLIB}/%_cxx_${VER}.so)
-MACROCLIBS=FCaloQLOOK_cxx FCaloCHKCALIB_cxx
+MACROSLIBS=$(MACROSRCS:${DIRMACROS}/%.cxx=${DIRLIB}/lib%_${VER}.so)
+MACROCLIBS=libFCaloQLOOK libFCaloCHKCALIB
 FULLMACROCLIBS=$(MACROCLIBS:%=${DIRLIB}/%_${VER}.so)
 FULLLINKMACROCLIBS=$(MACROCLIBS:%=${DIRLIB}/%.so)
 
@@ -98,12 +98,12 @@
 
 ${MACROSLIBS}: ${MACROSRCS}
 	@(${EGREEN} "Compiling macro: "${WHITE} "$@"; ${RESET})
-	@${ROOTCINT} -f ${DIRMACROS}/`basename $(@F) _cxx_${VER}.so`link.cxx -c -I${ROOTINC} ${DIRINC}/`basename $(@F) _cxx_${VER}.so`fun.h ${DIRINC}/`basename $(@F) _cxx_${VER}.so`LinkDef.h
-	@${CXX} ${CXXFLAGS} -Xlinker -soname=$(@F) -shared -o $@ ${DIRMACROS}/`basename $(@F) _cxx_${VER}.so`.cxx ${DIRMACROS}/`basename $(@F) _cxx_${VER}.so`link.cxx -lg2c -I${PAM_INC} -I${DIRTOP}/${DIRINC} -I${DIRTOP} -I${PAM_YODA}/include/yoda/ ${PAM_YODA}/lib/libyoda.so `root-config --cflags --glibs` 1>/dev/null
+	@${ROOTCINT} -f ${DIRMACROS}/`basename $(@F) _${VER}.so  | sed s/lib//`link.cxx -c -I${ROOTINC} ${DIRINC}/`basename $(@F) _${VER}.so  | sed s/lib//`fun.h ${DIRINC}/`basename $(@F) _${VER}.so  | sed s/lib//`LinkDef.h
+	@${CXX} ${CXXFLAGS} -Xlinker -soname=$(@F) -shared -o $@ ${DIRMACROS}/`basename $(@F) _${VER}.so  | sed s/lib//`.cxx ${DIRMACROS}/`basename $(@F) _${VER}.so  | sed s/lib//`link.cxx -lg2c -I${PAM_INC} -I${DIRTOP}/${DIRINC} -I${DIRTOP} -I${PAM_YODA}/include/yoda/ ${PAM_YODA}/lib/libyoda.so `root-config --cflags --glibs` 1>/dev/null
 
 ${CXXEXELIBS}: ${CXXEXEOBJS}
 	@(${EGREEN} "Creating exec file: "${WHITE} "$@"; ${RESET})
-	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRBIN}/$@.o -I${DIRINC} -I${PAM_INC} -I${PAM_YODA}/include/yoda/ ${PAM_YODA}/lib/libyoda.so ${DIRTOP}/${DIRLIB}/$@_cxx_${VER}.so `root-config --cflags --glibs`;
+	@${CXX} ${CXXFLAGS} -o ${DIRBIN}/$@ ${DIRBIN}/$@.o -I${DIRINC} -I${PAM_INC} -I${PAM_YODA}/include/yoda/ ${PAM_YODA}/lib/libyoda.so ${DIRTOP}/${DIRLIB}/lib$@_${VER}.so `root-config --cflags --glibs`;
 	@rm -f ${DIRSRC}/temp.cc
 
 # A small target to check environmental variables