Added the USEPACKAGE option in Makefile.

diff --git a/HLT/comp/Makefile b/HLT/comp/Makefile
index 72c073920e0a53aecccd21026a49de6c693ca5d7..b3682cde860c78c414ce7b13dbf51d4b5027cbea 100644 (file)
--- a/HLT/comp/Makefile
+++ b/HLT/comp/Makefile
@@ -5,8 +5,10 @@
 # Author: Anders Vestbo   #                    
 ###########################
 
-USEPACKAGE = ROOT
-#USEPACKAGE = ALIROOT
+#USEPACKAGE = ROOT
+USEPACKAGE = ALIROOT
+
+DEFSTR = -Dno_root
 
 CXX         = g++
 LD          = g++
@@ -21,12 +23,17 @@ LIBDIR = $(LEVEL3)/lib_$(USERNAME)
 
 ifeq ($(USEPACKAGE),ROOT) 
 INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp
+DEFSTR = -Duse_root
 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
 endif
 
+#Save the particle id's
+#DEFSTR += -Ddo_mc
+
 SRCS   = AliL3Modeller.cxx AliL3ModelTrack.cxx AliL3Compress.cxx
 
 DICT = AliL3CompCint.cxx
@@ -51,7 +58,7 @@ $(DICT) : $(HDRS)
 
 
 $(OBJDIR)/%.o : %.cxx 
-       $(CXX) $(CXXFLAGS) -c $(INCLUDES) -o $@ $<
+       $(CXX) $(CXXFLAGS) $(DEFSTR) -c $(INCLUDES) -o $@ $<
 
 $(OBJDIR) : 
        test ! -e $(OBJDIR) && mkdir -p $(OBJDIR)

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index 65d0dc16e05f9902408ee501b82a775dbe1a8e97..72de808da8b2f4dabe817098dbf0f10957d101e7 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/Makefile
@@ -8,6 +8,8 @@
 #USEPACKAGE = ROOT
 USEPACKAGE = ALIROOT
 
+DEFSTR = -Dno_root
+
 CXX         = g++
 LD          = g++
 CXXFLAGS    = -O2 -Wall -fPIC
@@ -20,16 +22,21 @@ LIBDIR = $(LEVEL3)/lib_$(USERNAME)
 
 ifeq ($(USEPACKAGE),ROOT) 
 INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp
+DEFSTR = -Duse_root
 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
 endif
 
+#Save the particle id's
+#DEFSTR += -Ddo_mc
+
 SRCS   = AliL3HoughTransformer.cxx AliL3Hough.cxx AliL3HoughTrack.cxx\
          AliL3HoughMaxFinder.cxx AliL3HoughEval.cxx AliL3HoughMerger.cxx \
          AliL3Histogram.cxx AliL3Histogram1D.cxx \
-         AliL3HoughIntMerger.cxx AliL3HoughGlobalMerger.cxx 
+         AliL3HoughIntMerger.cxx AliL3HoughGlobalMerger.cxx GetGoodParticles.cxx
 
 DICT = AliL3HoughCint.cxx
 DICTH = AliL3HoughCint.h
@@ -52,7 +59,7 @@ $(DICT) : $(HDRS)
 
 
 $(OBJDIR)/%.o : %.cxx 
-       $(CXX) $(CXXFLAGS) -c $(INCLUDES) -o $@ $<
+       $(CXX) $(CXXFLAGS) $(DEFSTR) -c $(INCLUDES) -o $@ $<
 
 $(OBJDIR) : 
        test ! -e $(OBJDIR) && mkdir -p $(OBJDIR)