changed include paths

[u/mrichter/AliRoot.git] / HLT / hlt.conf

diff --git a/HLT/hlt.conf b/HLT/hlt.conf
index e61e2f049906b706f48c6ef1004e1214b87f9485..842062dd4f009d85674483064aa21e143016c118 100644 (file)
--- a/HLT/hlt.conf
+++ b/HLT/hlt.conf
@@ -1,10 +1,27 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc -DROWHOUGH\
+TMPMAJOR = $.`cat HLT/MUON/src/Version/major.number`
+TMPMINOR = $.`cat HLT/MUON/src/Version/minor.number`
+
+HLTDEFS     := -Duse_aliroot -Duse_root \
+               -DROWHOUGHPARAMS -Duse_reconstruction\
                -Duse_newio -DROOTVERSION=\"unchecked\" \
-               -DALIROOTVERSION=\"unchecked\"
+               -DALIROOTVERSION=\"unchecked\" \
+              -D__ROOT__ -DUSE_ALILOG -DLINUX \
+              -DMAJOR_VERSION=$(TMPMAJOR) \
+              -DMINOR_VERSION=$(TMPMINOR) \
+              -DBUILD_NUMBER=0
+
+
+HLTCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(CXXFLAGS)))
+HLTCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(CFLAGS)))
+HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(CXXFLAGS))
+
 
-HLTCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS))))
-HLTCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(filter-out -Werror,$(CFLAGS))))
-HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Werror,$(CXXFLAGS)))
+ifdef ALIHLT_MLUCDIR
+HLTDEFS         += -Duse_logging
+EINCLUDE := $(ALIHLT_MLUCDIR)/include
+ELIBS    := MLUC
+ELIBSDIR :=$(ALIHLT_MLUCDIR)/lib/tgt_$(ALICE_TARGET)
+endif