--- calo/flight/FQLOOK/Makefile	2006/03/09 16:14:29	1.1.1.1
+++ calo/flight/FQLOOK/Makefile	2006/03/22 15:04:10	1.8
@@ -1,6 +1,6 @@
 # Flight quick look - FQLOOK
 # SOFTWARE VERSION
-VER= v1r01
+VER= v1r06
 # An almost general purpouse Makefile for PAMELA repository
 # Let's start with some usefull definition for colorize the echo 
 RED='\E[1;31;40m'
@@ -23,7 +23,7 @@
 # Here the variables used to override the standard make flags
 # C
 CC=gcc
-CFLAGS=-Wall 
+CFLAGS=-Wall -O -fPIC -pthread
 # Enviroment:
 GCCVER=`gcc --version | head -1`
 UNAMEA=`uname -a`
@@ -33,7 +33,7 @@
 F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash
 # C++
 CXX=g++
-CXXFLAGS=-Wall
+CXXFLAGS=-Wall -O -fPIC -pthread
 # ROOTCINT
 ROOTCINT=rootcint
 # Here the variables definig the local directories
@@ -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)
 
@@ -68,7 +68,7 @@
 
 CALIBFILES=
 
-DOCFILES=${DIRDOC}/fcaloQLOOK.README.pdf ${DIRDOC}/FQL-calo-doc.pdf
+DOCFILES=${DIRDOC}/fcaloQLOOK.README.pdf ${DIRDOC}/FQL-calo-opmanual.pdf ${DIRDOC}/FQL-calo-opmanual.doc
 
 # Here the Variables used for info target
 PACKAGE=Calorimeter flight quick look software 
@@ -96,14 +96,15 @@
 	@echo 'void info(){ printf("\nQLOOK flight package version: ${VER}\n\nCompiled on '${TODAY}' with: '${GCCVER}'\n\nOn: '${UNAMEA}'\n\n"); }' >> ${DIRSRC}/temp.cc
 	@${CXX} ${CXXFLAGS} -c -o $@ ${DIRSRC}/temp.cc -I${DIRINC} -I${PAM_INC} -I${PAM_YODA}/include/yoda/ `root-config --cflags`
 
+
 ${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` &>/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