X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=conf%2FMachineDef.Linux;h=1c41bf34d1801e9f83f751e41283af7291da7cc2;hb=f4341706542528ca35b84627e0a90553747d86fd;hp=73daf859a0bd517b78bd55f28397b3f56f7bf5ed;hpb=9d02daf68fa22269b485d0c07e97cb9dd8d99d40;p=u%2Fmrichter%2FAliRoot.git

diff --git a/conf/MachineDef.Linux b/conf/MachineDef.Linux
index 73daf859a0b..1c41bf34d18 100644
--- a/conf/MachineDef.Linux
+++ b/conf/MachineDef.Linux
@@ -1,24 +1,28 @@
+# $Id$
+ 
 # Which Machine 
 PLATFORM      = linux
 
 # The compilers
-CXX           = echo $*.cxx ; g++
-F77	      = echo $*.F ; g77
-CC	      = echo $*.c ; gcc
+CXX           = g++ 
+F77	      = g77
+CC	      = gcc
 
 # Global optimisation
-OPT           = -O2
-OPT           = -g
+OPT           = -O -g
 
 # Shared library suffix
 SL	      = so
 
+# AWK
+AWK	      = awk
+
 # The options
 #
 # starting from root.2.22 on Linux the flags -fno-rtti -fno-exceptions are
 # not necessary any more
 #
-CXXOPTS       = $(OPT) -Wall -fPIC
+CXXOPTS       = $(OPT) -Wall -fPIC -pipe
 COPT	      = $(OPT)
 FOPT	      = $(OPT) -fno-second-underscore
 
@@ -31,9 +35,12 @@ CLIBFOPT      =
 
 # Additional directories for dependencies
 
-DEPINC        = -I/usr/local/include/g++ -I/usr/local/include \
-		-I/usr/local/i686-pc-linux-gnu/include \
-		-I/usr/local/lib/gcc-lib/i686-pc-linux-gnu/egcs-2.91.60/include
+DEPINC	      = `rm -f /tmp/d_$$$$.cxx; touch /tmp/d_$$$$.cxx ; \
+                 g++ -v -c /tmp/d_$$$$.cxx -o /dev/null 2>&1 | \
+                 awk 'BEGIN {i=0} {if(substr($$0,1,10)=="End of sea") i=0; \
+                 if(i==1) printf "%s",$$sub(" ","-I")" "; \
+                 if(substr($$0,1,10) == "\#include <") i=1}' ; \
+                 rm /tmp/d_$$$$.cxx`
 		
 LD            = g++
 LDFLAGS       = $(OPT)
@@ -42,6 +49,7 @@ SHLD	      = $(LD)
 SOFLAGS       = -Wl,-soname,$(notdir $@) -shared 
 SHLIB         = -lg2c
 
-LIBS          = $(ROOTLIBS) -lm -ldl -rdynamic
-GLIBS         = $(ROOTLIBS) $(ROOTGLIBS) -L/usr/X11R6/lib -lX11 -lg2c -ldl -lcrypt -rdynamic
+LIBS          = $(ROOTLIBS) 
+LIBNOVER      = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'`
+GLIBS         = $(ROOTLIBS) -L/usr/X11R6/lib -lX11 -lg2c -lcrypt $(LIBNOVER)