--- trunk/Compilers/g95.mk	2008/02/27 13:16:39	3
+++ trunk/Compilers/g95.mk	2008/04/18 14:45:53	10
@@ -1,12 +1,19 @@
-# These are machine dependent macros, meant to be included in the
-# LMDZE makefile
+# 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/include/NetCDF_g95 /home/guez/include
+netcdf_lib_dir = /home/guez/lib /home/guez/lib/NetCDF_g95
+
+numer_rec_dir = /home/guez/lib/Numer_Rec_Lionel/a
+netcdf95_dir = /home/guez/lib/NetCDF95/g95
+IOIPSL_dir = /home/guez/lib/IOIPSL_Lionel/ac
+
 # Include flags:
-inc_flags =-I${libf_dir} -I${libf_dir}/dyn3d -I${libf_dir}/phylmd -I${libf_dir}/filtrez -I/home/guez/include -I/home/guez/lib/IOIPSL_Lionel/ac -I/home/guez/lib/Numer_Rec_Lionel/a
+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})
 
 # Other flags which do not affect run time performance:
 lang_flags = -ffree-form -pedantic -std=f95 -Wall -Wextra -Wno=136,163,165
@@ -20,4 +27,4 @@
 FFLAGS = ${inc_flags} ${perf_flags}
 F90FLAGS = ${inc_flags} ${lang_flags} ${perf_flags}
 
-LDLIBS = -L/home/guez/lib/IOIPSL_Lionel/ac -L/home/guez/lib -L/home/guez/lib/Numer_Rec_Lionel/a -lioipsl -lnetcdff -lnetcdf -lnumer_rec
+LDLIBS = $(addprefix -L, ${netcdf_lib_dir} ${numer_rec_dir} ${netcdf95_dir} ${IOIPSL_dir}) -lioipsl -lnetcdf95 -lnetcdff -lnetcdf -lnumer_rec