Split of the ACORDE libraries (Pedro Gonzalez)

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

diff --git a/build/Makefile.linuxicc b/build/Makefile.linuxicc
index b19f5cee5c61f73fc6459ccb29fd2ea6277072af..c47ba493c7badbdc9896dec6e89f1d06c330f8e3 100644 (file)
--- a/build/Makefile.linuxicc
+++ b/build/Makefile.linuxicc
@@ -1,23 +1,24 @@
 # Makefile for AliRoot for Linux with the Intel icc compiler
 
+# System dependent commands
+
+XARGS = xargs -r
+
+# The compilers
+CXX           = icc
+CC            = icc
+
 # Compiler version:
 ICC_MAJOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
                 cut -d'.' -f1)
 ICC_MINOR    := $(shell $(CXX) -V 2>&1 | awk '{ if (NR==1) print $$8 }' | \
                 cut -d'.' -f2)
 
-# The compilers
-CXX           = icc
-CC            = icc
-ifeq ($(ICC_MAJOR),8)
 F77           = ifort
-else
-F77           = ifc
-endif
 
 # Global optimisation
-OPT           = -O -g
-NOOPT         = -g -O0
+OPT           = -O -ip
+NOOPT         = -O0
 
 CXXOPT        = $(OPT)
 CXXNOOPT      = $(NOOPT)
@@ -41,7 +42,7 @@ DEPENDFFLAGS  = $(FFLAGS)
 # rootcint flags
 CINTFLAGS     =
 
-LD            = icc
+LD            = icpc
 LDFLAGS       = $(OPT)
 
 SHLD          = $(LD)
@@ -55,19 +56,10 @@ ALLIB         =
 AEXT         = a
 
 # additional ROOT libraries
-ROOTLIBS     += -lcrypt
 
 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