--- calo/flight/FQLOOK/Makefile	2008/09/23 08:04:51	1.26
+++ calo/flight/FQLOOK/Makefile	2009/08/04 13:59:20	1.27
@@ -29,8 +29,22 @@
 UNAMEA=`uname -a`
 TODAY=`date`
 # F77
+ifeq ($(GCC4),)
+export GCCVERS=$(shell echo `gcc -dumpversion | sed 's/\./\ /g'`)
+export GCCVERMAJ=$(word 1,$(GCCVERS))
+export GCC4=$(shell echo `echo "${GCCVERMAJ} > 3" |bc -l`)
+endif
+ifeq ($(GCC4),1)
+F77=gfortran
+LG2C=-lgfortran
+EXTRAOPT=
+else
 F77=g77
-F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash ${PAM_BIT} 
+LG2C=-lg2c
+EXTRAOPT=-Wno-globals -fvxt
+endif
+#F77FLAGS=  -Wall -Wno-globals -fvxt -fno-automatic -fbounds-check -g -extend_source -static -fno-backslash ${PAM_BIT} 
+F77FLAGS=  -Wall -funroll-loops -fPIC $(EXTRAOPT) -fno-automatic -fbounds-check -extend_source -static -fno-backslash ${PAM_BIT}
 # C++
 CXX=g++
 CXXFLAGS=-Wall -O4 -fPIC -pthread ${PAM_BIT} 
@@ -100,7 +114,7 @@
 ${MACROSLIBS}: ${MACROSRCS}
 	@(${EGREEN} "Compiling macro: "${WHITE} "$@"; ${RESET})
 	@${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
+	@${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})