DA for tuning FEE parameters

[u/mrichter/AliRoot.git] / build / Makefile.macosx64

diff --git a/build/Makefile.macosx64 b/build/Makefile.macosx64
index 7009c24101f623c25fa2dd8235257f80cf1dc43f..b56957097e2d8128057210a1c94f5b9ef99d8801 100644 (file)
--- a/build/Makefile.macosx64
+++ b/build/Makefile.macosx64
@@ -1,4 +1,5 @@
-# Makefile for AliRoot for MacOS X with gcc 64-bit mode
+# -*- 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
@@ -30,33 +26,34 @@ NOOPT         = -O0 -g
 CXXOPT        = $(OPT) 
 CXXNOOPT      = $(NOOPT) 
 COPT         = $(OPT)
-FOPT         = $(OPT) -fno-second-underscore 
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+FOPT         = $(OPT) -fno-second-underscore -m64
+ifeq (g95,$(F77))
 FOPT        += -fbounds-check
 endif
 
 # CERNLIB defines
-CLIBDEFS      = -DCERNLIB_LINUX -DCERNLIB_BLDLIB -DCERNLIB_CZ -DCERNLIB_PPC
+CLIBDEFS      = -DCERNLIB_LXIA64 -DCERNLIB_BLDLIB -DCERNLIB_CZ -DCERNLIB_PPC
 CLIBCXXOPTS   =
 CLIBCOPT      =
 CLIBFOPT      = $(CLIBDEFS)
 
-CXXSTF        = -m64 -pipe -Wall -W -Wno-long-double -pipe -fbounds-check -fsigned-char -fno-common -fmessage-length=0 -Woverloaded-virtual -Weffc++ -Wconversion -fno-default-inline -fno-inline -I/usr/X11R6/include -I$(FINK_ROOT)/include
+CXXSTF        = -m64 -pipe -Wall -W -Wno-long-double -pipe -fbounds-check -fsigned-char -fno-common -fmessage-length=0 -Woverloaded-virtual -Weffc++ -Wconversion -Wshadow -fno-default-inline -fno-inline -I/usr/X11R6/include -I$(FINK_ROOT)/include
 
 # Compiler flags
 CXXFLAGS      = $(CXXOPT) $(CXXSTF)
 
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
-CXXFLAGS+=-DFORTRAN_G95
-endif
 CXXFLAGSNO    = $(CXXNOOPT) $(CXXSTF) 
 
 CFLAGS       = $(COPT) -m64 -Wall -W -fno-common -pipe -I$(FINK_ROOT)/include
 
-FFLAGS        = $(CLIBFOPT) $(FOPT) -m64
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+FFLAGS        = $(CLIBFOPT) $(FOPT)
+ifeq (g95,$(F77))
 FFLAGS        += -ftrace=full
+FFLAGS       +=-DFORTRAN_G95
+else
+FFLAGS       +=-DFORTRAN_GFORTRAN
 endif
+
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS  = $(FFLAGS)
 
@@ -66,7 +63,7 @@ CINTFLAGS     =
 LD            = export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_MAJOR).$(MACOSX_MINOR) ; \
                unset LD_PREBIND ; \
                g++
-LDFLAGS       = $(OPT) $(DICTLOAD) -m64
+LDFLAGS       = $(OPT) -m64 $(DICTLOAD)
 
 SHLD        := $(LD)
 SOFLAGS      := -m64 -bundle -undefined dynamic_lookup
@@ -91,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)