Made display class work. Also added it to makefile.

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

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index 85ac3935ce7ad35adaf3a1636fd20cde49fd170b..29a50e2c2d29459437aaa0556c6fcadbca0f9df2 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/Makefile
@@ -1,80 +1,95 @@
-############################### TPC Makefile ##################################
-
-# Include machine specific definitions
-
-include $(ALICE_ROOT)/conf/GeneralDef
-include $(ALICE_ROOT)/conf/MachineDef.$(ALICE_TARGET)
-
-PACKAGE = AliL3Hough
-
-# C++ sources
-
-
-SRCS          = AliL3HoughTransformer.cxx AliL3Hough.cxx \
-                AliL3HoughMaxFinder.cxx AliL3HoughEval.cxx AliL3HoughMerge.cxx \
-                AliL3Histogram.cxx
-
-
-# C++ Headers
-
-HDRS          = $(SRCS:.cxx=.h) AliL3Defs.h AliL3HoughLinkDef.h
-# Library dictionary
-
-DICT          = AliL3HoughCint.cxx
-DICTH         = $(DICT:.cxx=.h)
-DICTO         = $(patsubst %.cxx,tgt_$(ALICE_TARGET)/%.o,$(DICT))
-
-# FORTRAN Objectrs
-
-FOBJS         = $(FSRCS:.f=.o)
-
-# C Objects
-
-COBJS         = $(CSRCS:.c=.o)
-
-# C++ Objects
-
-OBJS          = $(patsubst %.cxx,tgt_$(ALICE_TARGET)/%.o,$(SRCS)) $(DICTO)
-
-# C++ compilation flags
-
-CXXFLAGS      = $(CXXOPTS) -g -I$(ROOTSYS)/include -I. -I$(ALICE_ROOT)/include/ -I$(ALICE_ROOT)/TPC \
-               -I$(ALICE_ROOT)/CONTAINERS -I$(ALICE)/level3code/src    
-
-#CXXFLAGS      = $(CXXOPTS) -g -Wall -I$(ROOTSYS)/include -I. -I $(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/include/ -DCOMPILING
- 
-# FORTRAN compilation flags
-
-FFLAGS      = $(FOPT)
- 
-##### TARGETS #####
- 
-# Target
-
-SLIBRARY       = $(ALICE)/mylibs/libAliL3Hough.$(SL)
-
-default:       $(SLIBRARY)
-
-$(ALICE)/mylibs/libAliL3Hough.$(SL):  $(OBJS)
-
-$(DICT):               $(HDRS)
-
-depend:                        $(SRCS)
-
-TOCLEAN                        = $(OBJS) *Cint.h *Cint.cxx
-
-############################### General Macros ################################
-
-include $(ALICE_ROOT)/conf/GeneralMacros
-
-############################ Dependencies #####################################
-
-include tgt_$(ALICE_TARGET)/Make-depend 
-
-###########
-so:
-       rm -fr $(ALICE)/mylibs/libAliL3Hough.so
-clean:
-       rm -fr tgt_Linux/*.o
-       rm -fr $(ALICE)/mylibs/libAliL3Hough.so
-       rm -fr $(DICT) $(DICTH) $(DICTO)
+#$Id$
+###########################
+# Makefile for HLT code.  #
+#                         #
+# Author: Anders Vestbo   #                    
+###########################
+
+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)
+endif
+OBJDIR = lib
+
+ifeq ($(USEPACKAGE),ROOT) 
+INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp -I$(TOPDIR)/misc
+DEFSTR = -Duse_root
+OBJDIR = lib_ROOT
+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
+endif
+
+#Save the particle id's
+#DEFSTR += -Ddo_mc
+DEFSTR += $(EXTRADEF)
+
+#Use logging classes
+ifndef NOLOGGING
+DEFSTR += -Duse_logging
+endif
+
+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 \
+         AliL3HoughTransformerVhdl.cxx AliL3HoughDisplay.cxx
+
+DICT = AliL3HoughCint.cxx
+DICTH = AliL3HoughCint.h
+DICTO = $(OBJDIR)/AliL3HoughCint.o
+
+HDRS = $(SRCS:.cxx=.h) AliL3HoughLinkDef.h
+OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(DICTO)
+
+LEVELSO = $(LIBDIR)/libAliL3Hough.so
+
+all : $(OBJDIR) $(LIBDIR) $(LEVELSO)
+
+$(LEVELSO) : $(OBJS)
+       $(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
+
+$(DICT) : $(HDRS)
+       @echo "Generating dictionary..."
+       @rootcint -f $(DICT) -c $(INCLUDES) $(HDRS)
+
+
+$(OBJDIR)/%.o : %.cxx 
+       $(CXX) $(CXXFLAGS) $(DEFSTR) -c $(INCLUDES) -o $@ $<
+
+$(OBJDIR) : 
+       test ! -e $(OBJDIR) && mkdir -p $(OBJDIR)
+$(LIBDIR) :
+       test ! -e $(LIBDIR) && mkdir -p $(LIBDIR)
+
+clean :
+       rm -f $(OBJDIR)/*.o
+       rm -f $(LIBDIR)/libAliL3Hough.so
+       rm -f $(DICT) $(DICTH) 
+
+so: 
+       rm -f $(LIBDIR)/libAliL3Hough.so