More improved Makefile, setting logging paths, TOPDIR and LIBDIR.
authorvestbo <vestbo@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 16 Apr 2002 10:09:19 +0000 (10:09 +0000)
committervestbo <vestbo@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 16 Apr 2002 10:09:19 +0000 (10:09 +0000)
HLT/src/AliL3Logging.h
HLT/src/Makefile

index f5ec5368be39e79796e9cbd168ac95c7d23843e4..1f08bd79a54952d542cf6eb73167cc11967297c6 100644 (file)
@@ -1,12 +1,10 @@
 #ifndef ALIL3LOGGING_H
 #define ALIL3LOGGING_H
 
-#define use_logging
-
 #ifdef use_logging
 
-#include "/prog/alice/level3/kip/MLUC/include/MLUCLog.hpp"
-#include "/prog/alice/level3/kip/MLUC/include/MLUCLogServer.hpp"
+#include <MLUCLog.hpp>
+#include <MLUCLogServer.hpp>
 
 typedef MLUCLog AliL3Log;
 typedef MLUCLogServer AliL3LogServer;
index 42df98a3774ba689c70f5d3cd71ed1ca1cefac55..2b50f9806be5dc3f6181b1b601634614b2559267 100644 (file)
@@ -5,9 +5,12 @@
 # Author: Anders Vestbo   #                    
 ###########################
 
+ifndef USEPACKAGE
 #USEPACKAGE = ROOT
 USEPACKAGE = ALIROOT
+endif
 
+#used if USEPACKAGE=anything else
 DEFSTR = -Dno_root
 
 CXX         = g++
@@ -16,10 +19,13 @@ CXXFLAGS    = -O2 -Wall -fPIC
 LDFLAGS     = -O2
 SOFLAGS     = -shared
 
+ifndef TOPDIR
 TOPDIR = $(HOME)/level3code
-OBJDIR = lib
+endif
+ifndef LIBDIR
 LIBDIR = $(LEVEL3)/lib_$(USERNAME)
-
+endif
+OBJDIR = lib
 
 ifeq ($(USEPACKAGE),ROOT) 
 INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp
@@ -28,19 +34,28 @@ endif
 
 ifeq ($(USEPACKAGE),ALIROOT)
 INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp -I$(ALICE_ROOT)/include/ -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/CONTAINERS -I$(ALICE_ROOT)/STEER
-DEFSTR = -Duse_aliroot -Duse_root
+DEFSTR = -Duse_aliroot
 endif
 
 #Save the particle id's
 #DEFSTR += -Ddo_mc
 
+#Use logging classes
+DEFSTR += -Duse_logging
+
+ifdef MLUCDIR
+INCLUDES += -I$(MLUCDIR)/include
+else
+INCLUDES += -I/prog/alice/level3/kip/MLUC/include
+endif
+
 SRCS   = AliL3ConfMapper.cxx AliL3ConfMapPoint.cxx AliLevel3.cxx\
           AliL3ConfMapTrack.cxx AliL3ConfMapFit.cxx AliL3Track.cxx\
           AliL3Transform.cxx AliL3TrackMerger.cxx AliL3VertexArray.cxx \
           AliL3Vertex.cxx AliL3VertexFinder.cxx \
           AliL3Merger.cxx AliL3GlobalMerger.cxx AliL3ClustFinderNew.cxx \
           AliL3TrackArray.cxx AliL3InterMerger.cxx AliL3Logger.cxx \
-          AliL3MemHandler.cxx  AliL3Benchmark.cxx AliL3Display.cxx \
+          AliL3MemHandler.cxx  AliL3Benchmark.cxx AliL3Display.cxx\
 
 DICT = AliL3Cint.cxx
 DICTH = AliL3Cint.h
@@ -52,8 +67,8 @@ OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(DICTO)
 endif
 
 ifeq ($(USEPACKAGE),ALIROOT)
-HDRS = $(SRCS:.cxx=.h) AliL3FileHandler.h AliL3Evaluate.h AliL3LinkDef.h
-OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(OBJDIR)/AliL3FileHandler.o $(OBJDIR)/AliL3Evaluate.o $(DICTO)
+HDRS = $(SRCS:.cxx=.h) AliL3FileHandler.h AliL3LinkDef.h
+OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(OBJDIR)/AliL3FileHandler.o $(DICTO)
 endif
 
 LEVELSO = $(LIBDIR)/libAliL3.so
@@ -82,4 +97,33 @@ clean :
        rm $(DICT) $(DICTH) 
 
 so :
-       rm -f $(LIBDIR)/libAliL3.so
\ No newline at end of file
+       rm -f $(LIBDIR)/libAliL3.so
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+