X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2Fhlt.conf;h=ddd4178f8eb7366a227442c9ad448b1bd95377cd;hb=0284e4ef842b74ab2586e55eaf4b9631f3ac091c;hp=473287c2a4a8f52edaec29ff73de9b5b2090e798;hpb=a3282264d80ec67655625dadea42dfe88936b7cf;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/hlt.conf b/HLT/hlt.conf
index 473287c2a4a..ddd4178f8eb 100644
--- a/HLT/hlt.conf
+++ b/HLT/hlt.conf
@@ -1,11 +1,30 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-HLTDEFS     := -Duse_aliroot -Duse_root -Ddo_mc \
+HLTDEFS     := -Duse_aliroot -Duse_root \
                -DROWHOUGHPARAMS -Duse_reconstruction\
                -Duse_newio -DROOTVERSION=\"unchecked\" \
-               -DALIROOTVERSION=\"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