Changed definition of TOPDIR

[u/mrichter/AliRoot.git] / HLT / hough / Makefile

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index 49ad5961466e77dc3c12d78edfdcf811792634be..c9eb9afeca5b5cc1c7dd8ad952327845b4d8bfd5 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/Makefile
@@ -3,29 +3,19 @@
 # Makefile for HLT code.  #
 #                         #
 # Author: Anders Vestbo   #                    
+# changes by C. Loizides  #
 ###########################
 
-ifndef USEPACKAGE
-#USEPACKAGE = ROOT
-USEPACKAGE = ALIROOT
-endif
-
-#used if USEPACKAGE=anything else
-DEFSTR = -Dno_root
-
-CXX         = g++
-LD          = g++
-CXXFLAGS    = -O2 -Wall -fPIC
-LDFLAGS     = -O2
-SOFLAGS     = -shared
 
 ifndef TOPDIR
-TOPDIR = $(HOME)/level3code
-endif
-ifndef LIBDIR
-LIBDIR = $(LEVEL3)/lib_$(USERNAME)
+TOPDIR = $(shell pwd)/..
 endif
-OBJDIR = lib
+
+include $(TOPDIR)/Makefile.conf
+
+DEFSTR = -Dno_root
+OBJDIR = lib_alone
+INCLUDES = -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp -I$(TOPDIR)/misc
 
 ifeq ($(USEPACKAGE),ROOT) 
 INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp -I$(TOPDIR)/misc
@@ -36,33 +26,53 @@ endif
 ifeq ($(USEPACKAGE),ALIROOT)
 INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp -I$(TOPDIR)/misc -I$(ALICE_ROOT)/include/ -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/CONTAINERS -I$(ALICE_ROOT)/STEER
 DEFSTR = -Duse_aliroot -Duse_root
+OBJDIR = lib
 endif
 
 #Save the particle id's
-#DEFSTR += -Ddo_mc
+ifdef DO_MC
+DEFSTR += -Ddo_mc
+endif
 
 #Use logging classes
 ifndef NOLOGGING
 DEFSTR += -Duse_logging
 endif
 
+DEFSTR += $(EXTRADEF)
+
 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 AliL3HoughBaseTransformer.cxx \
-         AliL3HoughIntMerger.cxx AliL3HoughGlobalMerger.cxx 
+SRCS = AliL3HoughTransformer.cxx AliL3HoughTrack.cxx AliL3HoughClusterTransformer.cxx \
+       AliL3HoughEval.cxx AliL3HoughMerger.cxx AliL3HoughBaseTransformer.cxx \
+       AliL3HoughIntMerger.cxx AliL3HoughGlobalMerger.cxx AliL3HoughTransformerVhdl.cxx \
+       AliL3Histogram.cxx AliL3Histogram1D.cxx AliL3HoughMaxFinder.cxx AliL3Hough.cxx \
+       AliL3HoughTransformerLUT.cxx 
 
-DICT = AliL3HoughCint.cxx
-DICTH = AliL3HoughCint.h
-DICTO = $(OBJDIR)/AliL3HoughCint.o
+DICT  = AliL3HoughCint-$(USEPACKAGE).cxx
+DICTH = AliL3HoughCint-$(USEPACKAGE).h
+DICTO = $(OBJDIR)/AliL3HoughCint-$(USEPACKAGE).o
 
+ifeq ($(USEPACKAGE),ROOT)
+SRCS += AliL3HoughDisplay.cxx 
 HDRS = $(SRCS:.cxx=.h) AliL3HoughLinkDef.h
 OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(DICTO)
+endif
+
+ifeq ($(USEPACKAGE),ALIROOT)
+SRCS += AliL3HoughDisplay.cxx
+HDRS = $(SRCS:.cxx=.h) AliL3HoughLinkDef.h
+OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(DICTO)
+endif
+
+ifeq ($(OBJDIR),lib_alone)
+HDRS = $(SRCS:.cxx=.h) 
+OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS))
+endif
 
 LEVELSO = $(LIBDIR)/libAliL3Hough.so
 
@@ -73,14 +83,14 @@ $(LEVELSO) : $(OBJS)
 
 $(DICT) : $(HDRS)
        @echo "Generating dictionary..."
-       @rootcint -f $(DICT) -c $(INCLUDES) $(HDRS)
-
+       @rootcint -f $(DICT) -c $(INCLUDES) -DGCCVERSION=$(GCCVERSION) -include AliL3StandardIncludes.h $(HDRS)
 
 $(OBJDIR)/%.o : %.cxx 
        $(CXX) $(CXXFLAGS) $(DEFSTR) -c $(INCLUDES) -o $@ $<
 
 $(OBJDIR) : 
        test ! -e $(OBJDIR) && mkdir -p $(OBJDIR)
+
 $(LIBDIR) :
        test ! -e $(LIBDIR) && mkdir -p $(LIBDIR)
 
@@ -90,4 +100,4 @@ clean :
        rm -f $(DICT) $(DICTH) 
 
 so: 
-       rm -f $(LIBDIR)/libAliL3Hough.so
\ No newline at end of file
+       rm -f $(LIBDIR)/libAliL3Hough.so