Changeset 22 for trunk/SOURCES/Makefile

Timestamp:

11/25/15 20:33:43 (9 years ago)

Author:

roche

Message:

Petites adaptations diverses du code pour compilation en gfortran. Ajout d un Makefile flexible a option pour choisir ifort ou gfortran.

File:

• trunk/SOURCES/Makefile (modified) (1 diff)

trunk/SOURCES/Makefile

@@ -5 +5 @@
 #-------------------------------------------
 
-include Fichiers-parametres/Makefile.tof-lsce3130.inc
-#include Fichiers-parametres/Makefile.catritz-pc226.inc
-# include Fichiers-parametres/Makefile.pc246.inc
+#-------------------------------------------
+# dmr: Added options for a more flexible Makefile with the two compilers inbedded
+#-------------------------------------------
 
+# Choice for compiler (ifort = 1, gfortran = 0)
+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
+
+ifeq ($(ifort),1)
+  include Fichiers-parametres/Makefile.tof-lsce3130.inc
+else
+  include Fichiers-parametres/Makefile.dmr-lsce3027.inc
+endif
 
 #     Compilation (le corps du Makefile)
 #-------------------------------------------
-include Makefile.grisli.inc
+
+ifeq ($(ifort),1)
+  include Makefile.grisli.inc
+else
+  include Makefile.grisli-gfortran.inc
+endif