different eta cuts for trigger and associated particles, fixed some problems created...

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

diff --git a/build/Makefile.linuxicc b/build/Makefile.linuxicc
index ec2143bd7ebce7a6fe14a3d67ed92d0287313b70..b681d30b46da628898ce2bc10d46d4190a6e60e9 100644 (file)
--- a/build/Makefile.linuxicc
+++ b/build/Makefile.linuxicc
@@ -1,8 +1,9 @@
+# -*- mode: makefile -*-
 # Makefile for AliRoot for Linux with the Intel icc compiler
 
-# The compilers
-CXX           = icc
-CC            = icc
+# System dependent commands
+
+XARGS = xargs -r
 
 # Compiler version:
 ICC_MAJOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
@@ -10,16 +11,14 @@ 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)
 
-F77           = ifort
-
 # Global optimisation
 OPT           = -O -ip
 NOOPT         = -O0
 
-CXXOPT        = $(OPT)
-CXXNOOPT      = $(NOOPT)
-COPT          = $(OPT)
-FOPT          = $(OPT)
+CXXOPT        = $(OPT) -fPIC
+CXXNOOPT      = $(NOOPT) -fPIC
+COPT          = $(OPT) -fPIC
+FOPT          = $(OPT) -fPIC
 
 # CERNLIB defines
 CLIBDEFS      = -DCERNLIB_LINUX -DCERNLIB_BLDLIB -DCERNLIB_CZ
@@ -38,11 +37,11 @@ DEPENDFFLAGS  = $(FFLAGS)
 # rootcint flags
 CINTFLAGS     =
 
-LD            = icpc
+LD            = $(shell root-config --ld)
 LDFLAGS       = $(OPT)
 
 SHLD          = $(LD)
-SOFLAGS       = -Wl,-soname,$$TMPLIB -shared $(OPT)
+SOFLAGS       = -shared
 SHLIB         =
 SOEXT        = so
 
@@ -57,5 +56,5 @@ LIBNOVER      = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {
 
 #System libraries
 SYSLIBS      := -lcrypt -L/usr/X11R6/lib -lX11 $(LIBNOVER) -L/usr/local/lib \
-                -lXt -L$(shell which ifort | sed -e 's|bin/ifort|lib|') \
+                -lXt -L$(shell which ifort | sed -e 's|bin|lib|' | sed -e 's|ifort||') \
                 -lifcore -lifport