--- trunk/Compilers/g95.mk	2008/10/15 16:19:57	20
+++ trunk/Compilers/g95.mk	2012/07/26 14:37:37	62
@@ -1,19 +1,15 @@
 # These are compiler dependent macros, meant to be included in the
 # makefile for LMDZE.
 
-# For G95 0.91
-
-FC = g95
-
 netcdf_inc_dir = /home/guez_local/include/NetCDF_g95 /home/guez_local/include
-netcdf_lib_dir = /home/guez_local/lib /home/guez_local/lib/NetCDF_g95
+netcdf_lib_dir = /home/guez_local/lib/NetCDF_g95 /home/guez_local/lib
 
-numer_rec_dir = /home/guez_local/lib/Numer_Rec_Lionel/n
+numer_rec_dir = /home/guez_local/lib/Numer_Rec_Lionel/z
+nr_util_dir = /user/guez_local/lib/NR_util_a
 netcdf95_dir = /home/guez_local/lib/NetCDF95/g95
-IOIPSL_dir = /home/guez_local/lib/IOIPSL_Lionel/an
 
 # Include flags:
-inc_flags = $(addprefix -I, ${libf_dir} ${libf_dir}/dyn3d ${libf_dir}/phylmd ${libf_dir}/filtrez ${netcdf_inc_dir} ${numer_rec_dir} ${netcdf95_dir} ${IOIPSL_dir})
+inc_flags = $(addprefix -I, ${libf_dir} ${libf_dir}/phylmd ${netcdf_inc_dir} ${numer_rec_dir} ${netcdf95_dir} ${nr_util_dir})
 
 # Other flags which do not affect run time performance:
 lang_flags = -ffree-form -pedantic -std=f95 -Wall -Wextra -Wno=136,163,165
@@ -27,4 +23,4 @@
 FFLAGS = ${inc_flags} ${perf_flags}
 F90FLAGS = ${inc_flags} ${lang_flags} ${perf_flags}
 
-LDLIBS = $(addprefix -L, ${netcdf_lib_dir} ${numer_rec_dir} ${netcdf95_dir} ${IOIPSL_dir}) -lioipsl -lnetcdf95 -lnetcdff -lnetcdf -lnumer_rec
+LDLIBS = $(addprefix -L, ${netcdf_lib_dir} ${numer_rec_dir} ${netcdf95_dir} ${nr_util_dir}) -lnetcdf95 -lnetcdff -lnetcdf -lnumer_rec -lnr_util