--- gpamela/garfield/src/makefile_linux	2002/07/11 16:02:02	3.1
+++ gpamela/garfield/src/makefile_linux	2007/10/02 17:58:30	3.3
@@ -5,13 +5,20 @@
 # Based on a file from Michel Roethlisberger, IBM Switzerland.                #
 # --------------------------------------------------------------------------- #
 FC = g77
-LF= `/cern/pro/bin/cernlib graflib/X11,kernlib,mathlib,packlib`
+LF= `cernlib graflib/X11,kernlib,mathlib,packlib`
 # FF= -O
-FF= -O3 -malign-double -malign-loops=2 -malign-jumps=2 -malign-functions=2\
+# FF Flags mod by CAF on 2 Oct 2007 , obsolete options changed 
+# FF= -O3 -malign-double -malign-loops=2 -malign-jumps=2 -malign-functions=2\
+# -fno-init-local-zero -ffast-math -fno-f2c\
+# -fforce-mem -fforce-addr -fcaller-saves -fstrength-reduce\
+# -funroll-loops -frerun-cse-after-loop \
+#  -g -fdebug-kludge
+FF= -O3 -malign-double -falign-loops=2 -falign-jumps=2 -falign-functions=2\
 -fno-init-local-zero -ffast-math -fno-f2c\
 -fforce-mem -fforce-addr -fcaller-saves -fstrength-reduce\
 -funroll-loops -frerun-cse-after-loop \
- -g -fdebug-kludge
+ -g 
+# end CAF mod
 # G77_LIB_DIR=/usr/lib/gcc-lib/i386-redhat-linux/2.7.2.3
 # LF=-m elf_i386 -dynamic-linker /lib/ld-linux.so.1 -s -x -L$(G77_LIB_DIR)
 # LNKPRE=/usr/lib/crt1.o /usr/lib/crti.o $(G77_LIB_DIR)/crtbegin.o
@@ -27,7 +34,7 @@
 	rm *.f
 
 main-7.f: garfield-7.f
-	/cern/pro/bin/fcasplit garfield-7.f
+	fcasplit garfield-7.f
 	-rm garfield-7.f garfield-7.mkfca garfield-7.shfca y.lis
 	mv main.f main-7.f
 
@@ -36,7 +43,7 @@
 	./patchy_step garfield-7
 
 libgarfield-7.a: garfield-7.f
-	/cern/pro/bin/fcasplit garfield-7.f
+	fcasplit garfield-7.f
 	rm main.f garfield-7.f garfield-7.mkfca garfield-7.shfca y.lis
 	$(FC) -c $(FF) *.f
 	ar crv libgarfield-7.a *.o 
@@ -58,7 +65,7 @@
 #	rm *.f
 
 main.f: garfield.f
-	/cern/pro/bin/fcasplit garfield.f
+	fcasplit garfield.f
 	rm garfield.f garfield.mkfca garfield.shfca y.lis
 
 garfield.f: garfield.car maggarf.car heed101garf.car garfield.cra