X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FMakefile.conf;h=d2dc1e54b29a8dbb3ba1513fa212de64de17ddc7;hb=54df6e4de7daa0edd0d9ec406055f7aca4432d4a;hp=16b291375fbe29a1ae6914ca7f4358b77b15570c;hpb=5a31e9df6ecb0bed34b5c686d99e9752a4cb426f;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/Makefile.conf b/HLT/Makefile.conf
index 16b291375fb..d2dc1e54b29 100644
--- a/HLT/Makefile.conf
+++ b/HLT/Makefile.conf
@@ -1,3 +1,4 @@
+# -*- Mode: Makefile -*-
 #$Id$
 ################################
 # Makefile.conf for HLT code.  #
@@ -7,7 +8,11 @@
 ################################
 
 #Added for MACOSX
-ARCH = $(shell uname)
+ARCH := $(shell root-config --arch)
+
+ifeq ($(ARCH),macosxxlc)
+ARCH := macosx
+endif
 
 #Specify the directory where the level3code tree is located.
 ifndef ALIHLT_TOPDIR
@@ -54,25 +59,21 @@ ALIHLT_USENEWIO = false
 ifeq ($(ALICE_LEVEL),ali-head)
 ALIHLT_USENEWIO = true
 endif
-ifeq ($(ALICE_LEVEL),ali-v4-01-00)
-ALIHLT_USENEWIO = true
 endif
+
+ifeq ($(ALIHLT_ROWHOUGH),true)
+USEROWHOUGH = 1
 endif
 
 ifeq ($(ALIHLT_USENEWIO),true)
 USENEWIO = 1
 endif
 
-
 #----------------------------------------------------
 #Some compiler flags or defines: You can use your
 #own setting by defining them outside (make -e)
 #----------------------------------------------------
 
-GCCVERSION   = $(shell $(CXX) --version | head -n 1 | cut -d" " -f 3 | cut -d. -f 1 | cut -d" " -f1)
-CXXGCC3FLAGS = -DGCCVERSION=$(GCCVERSION)
-PROFILEFLAGS = -g -pg
-
 ifeq ($(ARCH),Darwin)
 FINKDIR         = /sw
 CXX             = g++
@@ -81,19 +82,20 @@ CINTCXXFLAGS  = -pipe -W -Wall -fsigned-char \
                 -DG__REGEXP  -DG__UNIX -DG__SHAREDLIB \
                 -DG__ROOT -DG__REDIRECTIO -DG__OSFDLL
 LD              = $(CXX)
-#SOFLAGS         = -bundle -flat_namespace -Xlinker -bind_at_load -undefined suppress
-SOFLAGS         = -bundle -flat_namespace -undefined suppress
-DYFLAGS         = -dynamiclib -flat_namespace -undefined suppress \
+#SOFLAGS         = -bundle -Xlinker -bind_at_load -undefined suppress
+SOFLAGS         = -bundle -undefined suppress
+DYFLAGS         = -dynamiclib -undefined suppress \
                   -compatibility_version 1 -current_version 1.0.0 
 LDFLAGS         = -O $(EXTRALDFLAGS) -L/sw/lib -ldl
-LDSTATIC     = ar
-STATICFLAGS  = rucs 
 else
 CXX          = g++
 CXXFLAGS     = -O2 -fPIC -Wall $(CXXGCC3FLAGS) $(EXTRACXXFLAGS) 
 LD           = $(CXX)
 LDFLAGS      = -O2 $(EXTRALDFLAGS)
 SOFLAGS      = -shared
-LDSTATIC     = ar
-STATICFLAGS  = rucs
 endif
+
+#static flags for profiling
+PROFILEFLAGS = -g -pg
+LDSTATIC     = ar
+STATICFLAGS  = rucs