X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=build%2FMakefile.linuxx8664gcc;h=5f1ec7732e07e6137df2decbc28c8f6ec7c61273;hb=61aa89ddf35e4af65156333d902ece47570ce92c;hp=bd5ac51df0a1bdcea342335d616b72bdca42d670;hpb=8371d3e2ab30cb3055c9307418f864eb4a085813;p=u%2Fmrichter%2FAliRoot.git

diff --git a/build/Makefile.linuxx8664gcc b/build/Makefile.linuxx8664gcc
index bd5ac51df0a..5f1ec7732e0 100644
--- a/build/Makefile.linuxx8664gcc
+++ b/build/Makefile.linuxx8664gcc
@@ -1,27 +1,15 @@
+# -*- mode: makefile -*-
 # Makefile to build AliRoot for Linux
 
 # System dependent commands
 
 XARGS = xargs -r
 
-# The compilers
-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
-
 # Global optimisation
-OPT           = -O0 -g
+OPT           = -O2 -g
 NOOPT         = -g
 
 CXXOPT        = $(OPT)
@@ -35,31 +23,33 @@ CLIBCXXOPTS   =
 CLIBCOPT      =
 CLIBFOPT      = $(CLIBDEFS)
 
+CXXWARN	      = -Wall -Wno-long-long -W -Weffc++ -Wshadow -Woverloaded-virtual -ansi
+
 # Compiler flags
 ifeq ($(CCMAJORV),2)
-CXXFLAGS       = $(OPT) -W -Wall -fPIC -pipe -m64
-CXXFLAGSNO     = $(NOOPT) -W -Wall -fPIC -pipe -m64
+CXXFLAGS       = $(OPT)   -fPIC -pipe
+CXXFLAGSNO     = $(NOOPT) -fPIC -pipe
 else
 ifeq ($(CCMAJORV),3)
-CXXFLAGS       = $(OPT) -W -Wall -Weffc++ -Woverloaded-virtual -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi -Dlinux -m64
-CXXFLAGSNO     = $(NOOPT) -W -Wall -Weffc++ -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi -m64
+CXXFLAGS       = $(OPT)   -fPIC -pipe -fmessage-length=0 -Dlinux
+CXXFLAGSNO     = $(NOOPT) -fPIC -pipe -fmessage-length=0
 else
 ifeq ($(CCMAJORV),4)
-CXXFLAGS       = $(OPT) -W -Wall -Weffc++ -Woverloaded-virtual -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi -Dlinux -m64
-CXXFLAGSNO     = $(NOOPT) -W -Wall -Weffc++ -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi -m64
+CXXFLAGS       = $(OPT)   -fPIC -pipe -fmessage-length=0 -Dlinux
+CXXFLAGSNO     = $(NOOPT) -fPIC -pipe -fmessage-length=0
 else
-CXXFLAGS       = $(OPT) -W -Wall -Woverloaded-virtual -fPIC -pipe -fmessage-length=0 -Wno-long-long -ansi -Dlinux -m64
-CXXFLAGSNO     = $(NOOPT) -W -Wall -Weffc++ -fPIC -pipe -fmessage-length=0 -Wno-long-long -ansi -m64
+CXXFLAGS       = $(OPT)   -fPIC -pipe -fmessage-length=0 -Dlinux
+CXXFLAGSNO     = $(NOOPT) -fPIC -pipe -fmessage-length=0
 endif
 endif
 endif
-CFLAGS	       = $(OPT) -Wall -Werror -fPIC -pipe -Wno-long-long -pedantic-errors -ansi -m64 
-FFLAGS         = $(CLIBFOPT) $(FOPT) -fno-second-underscore -fPIC -fno-f2c -m64
+CFLAGS	       = $(OPT) -Wall -Werror -fPIC -pipe -Wno-long-long -pedantic-errors -ansi
+FFLAGS         = $(CLIBFOPT) $(FOPT) -fno-second-underscore -fPIC -fno-f2c
 
-ifneq (,$(findstring g95,$(ROOTBUILD)))
+ifeq (g95,$(F77))
 FFLAGS	      +=-DFORTRAN_G95
 else
-ifneq (,$(findstring gfortran,$(ROOTBUILD)))
+ifeq (gfortran,$(F77))
 FFLAGS	      +=-DFORTRAN_GFORTRAN
 else
 FFLAGS	      +=
@@ -72,7 +62,7 @@ DEPENDFFLAGS   = $(FFLAGS)
 # rootcint flags
 CINTFLAGS     = 
 
-LD            = g++
+LD            = $(shell root-config --ld)
 LDFLAGS       = $(OPT) 
 
 SHLD	      = $(LD) 
@@ -84,12 +74,12 @@ LIBNOVER      = `find /lib64 -name 'libNoVersion*.so' | xargs --replace basename
 
 SYSLIBS      := -ldl -lcrypt -L/usr/X11R6/lib64 -lX11  $(LIBNOVER)
 
-ifneq (,$(findstring g95,$(ROOTBUILD)))
-SHLIB += -L$(shell g95 --print-search-dirs | sed -n -e 's/install: //p') -lf95
+ifneq (,$(findstring g95,$(F77)))
+SHLIB += -L$(shell $(F77) --print-search-dirs | sed -n -e 's/install: //p') -lf95
 else
-ifneq (,$(findstring gfortran,$(ROOTBUILD)))
-SHLIB := $(shell gfortran -print-file-name=libgfortran.so)
-SHLIB += $(shell gfortran -print-file-name=libgfortranbegin.a)
+ifneq (,$(findstring gfortran,$(F77)))
+SHLIB := $(shell $(F77) -print-file-name=libgfortran.so)
+SHLIB += $(shell $(F77) -print-file-name=libgfortranbegin.a)
 else
 SHLIB         = -lg2c
 SYSLIBS +=  -lg2c