Removing obsolete option

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

diff --git a/build/Makefile.macosx b/build/Makefile.macosx
index c2546eec274c8ef0ea0f8a63bf086314fca7dc25..4652c8d919d5a8820c8a9e0a9f882ca4ebed78e6 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
@@ -14,24 +15,19 @@ FINK_ROOT=/usr/local
 endif
 
 # The compilers
-CXX           = g++ 
-CC           = gcc
-
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
-F77          = g95
-else
-F77          = gfortran
-endif
+CXX           = $(shell root-config --cxx) 
+CC           = $(shell root-config --cc)
+F77          = $(shell root-config --f77)
 
 # Global optimisation
 OPT           = -O -g
-NOOPT         = -g
+NOOPT         = -O0 -g
 
 CXXOPT        = $(OPT) 
 CXXNOOPT      = $(NOOPT) 
 COPT         = $(OPT)
 FOPT         = $(OPT) -fno-second-underscore 
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
+ifeq (,$(findstring g95,$(F77)))
 FOPT        += -fbounds-check
 endif
 
@@ -41,17 +37,23 @@ CLIBCXXOPTS   =
 CLIBCOPT      =
 CLIBFOPT      = $(CLIBDEFS)
 
+CXXSTF        =  -pipe -Wall -W -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)   -Wall -W -Wno-long-double -pipe -fbounds-check -fsigned-char -fno-common -fmessage-length=0 -I$(FINK_ROOT)/include -Woverloaded-virtual #-Weffc++ 
+CXXFLAGS      = $(CXXOPT) $(CXXSTF)
 
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
-CXXFLAGS+=-DFORTRAN_G95
-endif
-CXXFLAGSNO    = $(CXXNOOPT) -Wall -W -pipe -fsigned-char -fno-common -fmessage-length=0 -I$(FINK_ROOT)/include  -Wno-long-double
+CXXFLAGSNO    = $(CXXNOOPT) $(CXXSTF) 
 
 CFLAGS       = $(COPT) -Wall -W -fno-common -pipe -I$(FINK_ROOT)/include
 
 FFLAGS        = $(CLIBFOPT) $(FOPT)
+ifneq (,$(findstring g95,$(F77)))
+FFLAGS        += -ftrace=full
+FFLAGS        +=-DFORTRAN_G95
+else
+FFLAGS        +=-DFORTRAN_GFORTRAN
+endif
+
 # rmkdepend flags for building dependencies of FORTRAN files
 DEPENDFFLAGS  = $(FFLAGS)
 
@@ -60,7 +62,7 @@ CINTFLAGS     =
 
 LD            = export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_MAJOR).$(MACOSX_MINOR) ; \
                unset LD_PREBIND ; \
-               g++
+               $(shell root-config --ld)
 LDFLAGS       = $(OPT) $(DICTLOAD)
 
 SHLD        := $(LD)
@@ -86,8 +88,10 @@ EXEFLAGS     := -bind_at_load
 
 #System libraries
 
-ifeq (g95,$(findstring g95,$(ROOTBUILD)))
-SYSLIBS += -L$(shell g95 --print-search-dirs | sed -n -e 's/install: //p') -lf95
+ifneq (,$(findstring g95,$(F77)))
+SYSLIBS += -L$(shell $(F77) --print-search-dirs | sed -n -e 's/install: //p') -lf95
+DYLIB += -L$(shell $(F77) --print-search-dirs | sed -n -e 's/install: //p') -lf95
 else
-SYSLIBS += -ldl -L$(shell gfortran --print-search-dirs | sed -n -e 's/install: //p') -lgfortranbegin -lgfortran
+SYSLIBS += -ldl $(shell $(F77) -print-file-name=libgfortran.dylib)
+SYSLIBS += $(shell $(F77) -print-file-name=libgfortranbegin.a)
 endif