Improved Makefile, by setting logging path, TOPDIR and LIBDIR.
authorvestbo <vestbo@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 16 Apr 2002 10:10:11 +0000 (10:10 +0000)
committervestbo <vestbo@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 16 Apr 2002 10:10:11 +0000 (10:10 +0000)
HLT/comp/Makefile
HLT/hough/Makefile

index b3682cd..b9268c3 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 -Woverloaded-virtual
 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
@@ -34,6 +40,15 @@ 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   = AliL3Modeller.cxx AliL3ModelTrack.cxx AliL3Compress.cxx
 
 DICT = AliL3CompCint.cxx
index 72de808..f14ab51 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,9 +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
@@ -33,6 +40,15 @@ 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   = AliL3HoughTransformer.cxx AliL3Hough.cxx AliL3HoughTrack.cxx\
          AliL3HoughMaxFinder.cxx AliL3HoughEval.cxx AliL3HoughMerger.cxx \
          AliL3Histogram.cxx AliL3Histogram1D.cxx \