making the -notree option the default, some minor code cleanup

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

diff --git a/HLT/hlt.conf b/HLT/hlt.conf
index dfe4e7d3b6c2588b697997d85b29b0d91341fd6f..2e574efb894344451e00235b3c4e54fac3967157 100644 (file)
--- a/HLT/hlt.conf
+++ b/HLT/hlt.conf
@@ -7,12 +7,17 @@ HLTDEFS     := -Duse_aliroot -Duse_root \
                -DALIROOTVERSION=\"unchecked\" \
               -D__ROOT__ -DUSE_ALILOG -DLINUX
 
-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 -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
+HLTDEFS += -DDEBUG -D__DEBUG
 else
 HLTDEFS += -DNDEBUG
 endif