Chose the Fortran compiler after ROOT

diff --git a/build/Makefile.alphacxx6 b/build/Makefile.alphacxx6
index 51ab60a5de5b44c1e243e740f6f68924679638bd..c8f2e9cf873c857f301cf736b7eaf13e347df3f3 100644 (file)
--- a/build/Makefile.alphacxx6
+++ b/build/Makefile.alphacxx6
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile to build AliRoot for Alpha OSF1
 
 # System dependent commands

diff --git a/build/Makefile.hpuxacc b/build/Makefile.hpuxacc
index f53fbf95c899acaa9350ab111a51cb03082306d1..cbdc7f79c8fa4410d57b4bdb636f15c6746955d7 100644 (file)
--- a/build/Makefile.hpuxacc
+++ b/build/Makefile.hpuxacc
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile to build AliRoot on HP-UX
 
 # System dependent commands

diff --git a/build/Makefile.linux b/build/Makefile.linux
index f29caa39460fb93a2b8aaf7435e5f57c4b44337b..6771cf3de1bc461c17be93acfeeaa484e80cf104 100644 (file)
--- a/build/Makefile.linux
+++ b/build/Makefile.linux
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile to build AliRoot for Linux
 
 # System dependent commands
@@ -9,16 +10,7 @@ CXX           = g++
 CC           = gcc
 CCMAJORV      = $(shell $(CC) -dumpversion | cut -d. -f1)
 CCMINORV      = $(shell $(CC) -dumpversion | cut -d. -f2)
-
-ifneq (,$(findstring g95,$(ROOTBUILD)))
-F77      = g95
-else
-ifneq (,$(findstring gfortran,$(ROOTBUILD)))
-F77      = gfortran
-else
-F77      = g77
-endif
-endif
+F77          = $(shell root-config --f77)
 
 # Global optimisation
 OPT           = -O -g
@@ -56,10 +48,10 @@ endif
 CFLAGS        = $(OPT) -Wall -Werror -fPIC -pipe -Wno-long-long -pedantic-errors -ansi
 FFLAGS         = $(CLIBFOPT) $(FOPT) -fno-second-underscore
 
-ifneq (,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 FFLAGS       +=-DFORTRAN_G95
 else
-ifneq (,$(findstring gfortran,$(ROOTBUILD)))
+ifeq (gfortran,$(F77))
 FFLAGS       +=-DFORTRAN_GFORTRAN
 else
 FFLAGS       +=
@@ -82,10 +74,10 @@ SOEXT             = so
 #System libraries
 SYSLIBS      := -ldl -lcrypt -L/usr/X11R6/lib -lX11
 
-ifneq (,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 SHLIB += -L$(shell g95 --print-search-dirs | sed -n -e 's/install: //p') -lf95
 else
-ifneq (,$(findstring gfortran,$(ROOTBUILD)))
+ifeq (gfortran,$(F77))
 SHLIB := $(shell gfortran -print-file-name=libgfortran.so)
 SHLIB += $(shell gfortran -print-file-name=libgfortranbegin.a)
 SYSLIBS += $(SHLIB)

diff --git a/build/Makefile.linuxia64ecc b/build/Makefile.linuxia64ecc
index 617fedf7b80f241e614ccb70494055811c3290a7..292fd76af1e926474dd17e4d581d802ab395bee4 100644 (file)
--- a/build/Makefile.linuxia64ecc
+++ b/build/Makefile.linuxia64ecc
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile for AliRoot for Itanium/Linux with Intel icc compiler
 
 # System dependent commands

diff --git a/build/Makefile.linuxia64gcc b/build/Makefile.linuxia64gcc
index e92758d31a2a1af692d122d7865b1b3944e8784a..d9936dda42261cc4c4c70c4b04095cb8f64bdc01 100644 (file)
--- a/build/Makefile.linuxia64gcc
+++ b/build/Makefile.linuxia64gcc
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile for AliRoot for Itanium/Linux with gcc
 
 # System dependent commands

diff --git a/build/Makefile.linuxicc b/build/Makefile.linuxicc
index c47ba493c7badbdc9896dec6e89f1d06c330f8e3..8b7ce1f64d1b7a825f6c3fac68d92899067a9724 100644 (file)
--- a/build/Makefile.linuxicc
+++ b/build/Makefile.linuxicc
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile for AliRoot for Linux with the Intel icc compiler
 
 # System dependent commands

diff --git a/build/Makefile.linuxx8664gcc b/build/Makefile.linuxx8664gcc
index bd5ac51df0a1bdcea342335d616b72bdca42d670..0d7bd32631771599ccf1495ef4eadb878185c053 100644 (file)
--- a/build/Makefile.linuxx8664gcc
+++ b/build/Makefile.linuxx8664gcc
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile to build AliRoot for Linux
 
 # System dependent commands
@@ -9,16 +10,7 @@ CXX           = g++
 CC           = gcc
 CCMAJORV      = $(shell $(CC) -dumpversion | cut -d. -f1)
 CCMINORV      = $(shell $(CC) -dumpversion | cut -d. -f2)
-
-ifneq (,$(findstring g95,$(ROOTBUILD)))
-F77      = g95
-else
-ifneq (,$(findstring gfortran,$(ROOTBUILD)))
-F77      = gfortran
-else
-F77      = g77
-endif
-endif
+F77          = $(shell root-config --f77)
 
 # Global optimisation
 OPT           = -O0 -g
@@ -56,10 +48,10 @@ endif
 CFLAGS        = $(OPT) -Wall -Werror -fPIC -pipe -Wno-long-long -pedantic-errors -ansi -m64 
 FFLAGS         = $(CLIBFOPT) $(FOPT) -fno-second-underscore -fPIC -fno-f2c -m64
 
-ifneq (,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 FFLAGS       +=-DFORTRAN_G95
 else
-ifneq (,$(findstring gfortran,$(ROOTBUILD)))
+ifeq (gfortran,$(F77))
 FFLAGS       +=-DFORTRAN_GFORTRAN
 else
 FFLAGS       +=
@@ -84,10 +76,10 @@ LIBNOVER      = `find /lib64 -name 'libNoVersion*.so' | xargs --replace basename
 
 SYSLIBS      := -ldl -lcrypt -L/usr/X11R6/lib64 -lX11  $(LIBNOVER)
 
-ifneq (,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 SHLIB += -L$(shell g95 --print-search-dirs | sed -n -e 's/install: //p') -lf95
 else
-ifneq (,$(findstring gfortran,$(ROOTBUILD)))
+ifeq (gfortran,$(F77))
 SHLIB := $(shell gfortran -print-file-name=libgfortran.so)
 SHLIB += $(shell gfortran -print-file-name=libgfortranbegin.a)
 else

diff --git a/build/Makefile.macosx b/build/Makefile.macosx
index e36d3e9432548efb34da4573da9c66969c305fd4..2f46df15e108e941d61c6345a1f44a1514139048 100644 (file)
--- a/build/Makefile.macosx
+++ b/build/Makefile.macosx
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile for AliRoot for MacOS X with gcc
 
 XARGS = xargs
@@ -16,12 +17,7 @@ endif
 # The compilers
 CXX           = g++ 
 CC           = gcc
-
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
-F77          = g95
-else
-F77          = gfortran
-endif
+F77          = $(root-config --f77)
 
 # Global optimisation
 OPT           = -O -g
@@ -31,7 +27,7 @@ CXXOPT        = $(OPT)
 CXXNOOPT      = $(NOOPT) 
 COPT         = $(OPT)
 FOPT         = $(OPT) -fno-second-underscore 
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 FOPT        += -fbounds-check
 endif
 
@@ -51,7 +47,7 @@ CXXFLAGSNO    = $(CXXNOOPT) $(CXXSTF)
 CFLAGS       = $(COPT) -Wall -W -fno-common -pipe -I$(FINK_ROOT)/include
 
 FFLAGS        = $(CLIBFOPT) $(FOPT)
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 FFLAGS        += -ftrace=full
 FFLAGS        +=-DFORTRAN_G95
 else
@@ -92,7 +88,7 @@ EXEFLAGS     := -bind_at_load
 
 #System libraries
 
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 SYSLIBS += -L$(shell g95 --print-search-dirs | sed -n -e 's/install: //p') -lf95
 DYLIB += -L$(shell g95 --print-search-dirs | sed -n -e 's/install: //p') -lf95
 else

diff --git a/build/Makefile.macosx64 b/build/Makefile.macosx64
index 3f661ddf52394a2704baf063de04e52daf9727cf..b56957097e2d8128057210a1c94f5b9ef99d8801 100644 (file)
--- a/build/Makefile.macosx64
+++ b/build/Makefile.macosx64
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile for AliRoot for MacOS X with gcc
 
 XARGS = xargs
@@ -16,12 +17,7 @@ endif
 # The compilers
 CXX           = g++ 
 CC           = gcc
-
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
-F77          = g95
-else
-F77          = gfortran
-endif
+F77          = $(shell root-config --f77)
 
 # Global optimisation
 OPT           = -O -g
@@ -31,7 +27,7 @@ CXXOPT        = $(OPT)
 CXXNOOPT      = $(NOOPT) 
 COPT         = $(OPT)
 FOPT         = $(OPT) -fno-second-underscore -m64
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 FOPT        += -fbounds-check
 endif
 
@@ -51,7 +47,7 @@ CXXFLAGSNO    = $(CXXNOOPT) $(CXXSTF)
 CFLAGS       = $(COPT) -m64 -Wall -W -fno-common -pipe -I$(FINK_ROOT)/include
 
 FFLAGS        = $(CLIBFOPT) $(FOPT)
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 FFLAGS        += -ftrace=full
 FFLAGS       +=-DFORTRAN_G95
 else
@@ -92,7 +88,7 @@ EXEFLAGS     := -bind_at_load
 
 #System libraries
 
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 SYSLIBS += -L$(shell g95 --print-search-dirs | sed -n -e 's/install: //p') -lf95
 else
 SYSLIBS += -ldl $(shell $(F77) -m64 -print-file-name=libgfortran.dylib)

diff --git a/build/Makefile.macosxicc b/build/Makefile.macosxicc
index 625bcfa932739e37b3defb0bdcb53e2b75692630..e8797d5b1d93f1f6fbf8c18ba9e718b0d74ff6e7 100644 (file)
--- a/build/Makefile.macosxicc
+++ b/build/Makefile.macosxicc
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile for AliRoot for MacOS X with gcc
 
 XARGS = xargs

diff --git a/build/Makefile.macosxxlc b/build/Makefile.macosxxlc
index 68ecf4295ec09dbfc563973819f419f148e32e50..a9e37fed7be1ff8ada82812a899005b625c49185 100644 (file)
--- a/build/Makefile.macosxxlc
+++ b/build/Makefile.macosxxlc
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile for AliRoot for MacOS X using the IBM xlc compiler
 
 # The compilers

diff --git a/build/Makefile.solarisCC5 b/build/Makefile.solarisCC5
index cefda450eff93f1c75a92dfce66abbcc1e5914c2..3159752d973c8abd9ee4ba7dff8d94b63ae752c1 100644 (file)
--- a/build/Makefile.solarisCC5
+++ b/build/Makefile.solarisCC5
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile to build ALIROOT for SunOS
 
 # System dependent commands

diff --git a/build/Makefile.win32gcc b/build/Makefile.win32gcc
index 6734c6c68a056d67357687c7af05eacb86b4f16e..bf5e008c510ee1e94f3a59684083575b2c10bfc8 100644 (file)
--- a/build/Makefile.win32gcc
+++ b/build/Makefile.win32gcc
@@ -1,3 +1,4 @@
+# -*- mode: makefile -*-
 # Makefile to build AliRoot for Linux
 
 # System dependent commands