bug fixes

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

diff --git a/HLT/hlt.conf b/HLT/hlt.conf
index a252431191de7ecd29454ed6ded2c62fbdea8e23..ddd4178f8eb7366a227442c9ad448b1bd95377cd 100644 (file)
--- a/HLT/hlt.conf
+++ b/HLT/hlt.conf
@@ -1,10 +1,30 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc -DROWHOUGH\
-               -Duse_newio -D${ALICE_TARGET} -DROOTVERSION=\"unchecked\" \
-               -DALIROOTVERSION=\"unchecked\"
+HLTDEFS     := -Duse_aliroot -Duse_root \
+               -DROWHOUGHPARAMS -Duse_reconstruction\
+               -Duse_newio -DROOTVERSION=\"unchecked\" \
+               -DALIROOTVERSION=\"unchecked\" \
+              -D__ROOT__ -DUSE_ALILOG -DLINUX
 
-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)))
+HLTCXXFLAGS := $(filter-out -ansi, $(filter-out -pedantic-errors, $(filter-out -Woverloaded-virtual, $(CXXFLAGS))))
+HLTCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(filter-out -Woverloaded-virtual, $(CFLAGS))))
+HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(filter-out -Woverloaded-virtual, $(CXXFLAGS)))
+HLTSOFLAGS  := $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)
+
+ifeq (win32gcc,$(ALICE_TARGET))
+HLTSOFLAGS  += $(LIBRARY_DEP)
+endif
+
+ifdef ALIDEBUG
+HLTDEFS += -DDEBUG -D__DEBUG
+else
+HLTDEFS += -DNDEBUG
+endif
+
+ifdef ALIHLT_MLUCDIR
+HLTDEFS         += -Duse_logging
+EINCLUDE += $(ALIHLT_MLUCDIR)/include
+ELIBS    += MLUC
+ELIBSDIR +=$(ALIHLT_MLUCDIR)/lib/tgt_$(ALICE_TARGET)
+endif