Made valid calibrations w/range 0-999999 - note oversampling is 4

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

diff --git a/build/Makefile.linuxicc b/build/Makefile.linuxicc
index 9cffb66f29ac8e2ff34f6a517a6a3399479d47d4..c47ba493c7badbdc9896dec6e89f1d06c330f8e3 100644 (file)
--- a/build/Makefile.linuxicc
+++ b/build/Makefile.linuxicc
@@ -1,6 +1,10 @@
-PLATFORM:=linuxicc
+# Makefile for AliRoot for Linux with the Intel icc compiler
 
-# The C/C++ compilers
+# System dependent commands
+
+XARGS = xargs -r
+
+# The compilers
 CXX           = icc
 CC            = icc
 
@@ -10,36 +14,35 @@ ICC_MAJOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
 ICC_MINOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
                 cut -d'.' -f2)
 
-# The Fortran compiler
-ifeq ($(ICC_MAJOR),8)
 F77           = ifort
-else
-F77           = ifc
-endif
 
 # Global optimisation
-OPT           = -O -g
+OPT           = -O -ip
+NOOPT         = -O0
 
-CXXOPTS       = $(OPT)
+CXXOPT        = $(OPT)
+CXXNOOPT      = $(NOOPT)
 COPT          = $(OPT)
 FOPT          = $(OPT)
-CXXFLAGS      = $(CXXOPTS)
-CFLAGS        = $(COPT)
-
-# rootcint flags
-CINTFLAGS     =
 
 # CERNLIB defines
-
 CLIBDEFS      = -DCERNLIB_LINUX -DCERNLIB_BLDLIB -DCERNLIB_CZ
 CLIBCXXOPTS   =
 CLIBCOPT      =
-CLIBFOPT      =
+CLIBFOPT      = $(CLIBDEFS)
+
+# Compiler flags
+CXXFLAGS      = $(CXXOPT)
+CXXFLAGSNO    = $(CXXNOOPT)
+CFLAGS        = $(COPT)
+FFLAGS        = $(CLIBFOPT) $(FOPT)
+# rmkdepend flags for building dependencies of FORTRAN files
+DEPENDFFLAGS  = $(FFLAGS)
 
-# Common Fortran compilation flags
-FFLAGS = $(CLIBFOPT) $(CLIBDEFS) $(FOPT)
+# rootcint flags
+CINTFLAGS     =
 
-LD            = icc
+LD            = icpc
 LDFLAGS       = $(OPT)
 
 SHLD          = $(LD)
@@ -53,22 +56,10 @@ ALLIB         =
 AEXT         = a
 
 # additional ROOT libraries
-ROOTLIBS     += -lcrypt
-
-# rmkdepend flags for building dependencies of FORTRAN files
-DEPENDFFLAGS  = $(FFLAGS)
 
 LIBNOVER      = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'`
-GLIBS         = $(LIBNOVER)
 
 #System libraries
-SYSLIBS =
-
-EXEFLAGS     += -L/usr/local/lib -lXt
-ifeq ($(ICC_MAJOR),8)
-EXEFLAGS     += -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
-                -lifcore
-else
-EXEFLAGS     += -L$(shell which ifc | sed -e 's|bin/ifc|lib|') \
-                -lF90 -lCEPCF90 -lintrins
-endif
+SYSLIBS      := -lcrypt -L/usr/X11R6/lib -lX11 $(LIBNOVER) -L/usr/local/lib \
+                -lXt -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
+                -lifcore -lifport