Changeset 78 for branches/iLoveclim/SOURCES/Makefile

Timestamp:

07/11/16 11:48:31 (8 years ago)

Author:

roche

Message:

Corrected a few little issues to create libgrisli with gfortran. afq, dmr

File:

• branches/iLoveclim/SOURCES/Makefile (modified) (2 diffs)

branches/iLoveclim/SOURCES/Makefile

@@ -2 +2 @@
 # Makefile pour construire les executables grisli en fonction de la machin
 # Pour compiler : make -f Makefile-template Grice2sea
-# 
+#
 #       machine sur laquelle on tourne
 #-------------------------------------------
@@ -11 +11 @@
 
 # Choice for compiler (ifort = 1, gfortran = 0)
-ifort ?= 1
+ifort := 0
 
 # Choice for librairies (mkl_c = 1 = MKL,  = 0 = BLAS)
 #Â NOTA: mkl_c = 1 with ifort = 0 ignores the MKL and uses BLAS anyhow
-mkl_c ?= 1
+mkl_c := 0
 
-#ifeq ($(ifort),1)
+ifeq ($(ifort),1)
   include Fichiers-parametres/Makefile.tof-lsce3130.inc
-#else
-#  include Fichiers-parametres/Makefile.dmr-lsce3027.inc
-#endif
+else
+  include Fichiers-parametres/Makefile.dmr-lsce3027.inc
+endif
 
 #     Compilation (le corps du Makefile)
 #-------------------------------------------
 
-#ifeq ($(ifort),1)
+ifeq ($(ifort),1)
   include Makefile.grisli.inc
-#else
-#  include Makefile.grisli-gfortran.inc
-#endif
+else
+  include Makefile.grisli-gfortran.inc
+endif