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 052037a13a07e3955a7ac5c43ecaf9210ac4abfe..2e574efb894344451e00235b3c4e54fac3967157 100644 (file)
--- a/HLT/hlt.conf
+++ b/HLT/hlt.conf
@@ -1,23 +1,26 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-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\" \
-              -D__ROOT__ -DUSE_ALILOG -DLOG_NO_DEBUG -DLINUX \
-              -DMAJOR_VERSION=$(TMPMAJOR) \
-              -DMINOR_VERSION=$(TMPMINOR) \
-              -DBUILD_NUMBER=0
+              -D__ROOT__ -DUSE_ALILOG -DLINUX
 
+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)
 
-HLTCXXFLAGS := $(filter-out -ansi,$(filter-out -pedantic-errors, $(CXXFLAGS)))
-HLTCFLAGS   := $(filter-out -ansi, $(filter-out -pedantic-errors, $(CFLAGS)))
-HLTDCXXFLAGS:= $(filter-out -pedantic-errors, $(CXXFLAGS))
+ifeq (win32gcc,$(ALICE_TARGET))
+HLTSOFLAGS  += $(LIBRARY_DEP)
+endif
 
+ifdef ALIDEBUG
+HLTDEFS += -DDEBUG -D__DEBUG
+else
+HLTDEFS += -DNDEBUG
+endif
 
 ifdef ALIHLT_MLUCDIR
 HLTDEFS         += -Duse_logging