Minor changes to make it work with new Top Makefile. Also have generated code separat...

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

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index f14ab51ba4e581701d59a52725736508bce890c7..09595d7ac0c86fa2431d6e9bac8471f9a79f4f87 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/Makefile
@@ -3,45 +3,43 @@
 # 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 = `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
+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$(ALICE_ROOT)/include/ -I$(ALICE_ROOT)/TPC -I$(ALICE_ROOT)/CONTAINERS -I$(ALICE_ROOT)/STEER
+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
@@ -51,17 +49,23 @@ endif
 
 SRCS   = AliL3HoughTransformer.cxx AliL3Hough.cxx AliL3HoughTrack.cxx\
          AliL3HoughMaxFinder.cxx AliL3HoughEval.cxx AliL3HoughMerger.cxx \
-         AliL3Histogram.cxx AliL3Histogram1D.cxx \
-         AliL3HoughIntMerger.cxx AliL3HoughGlobalMerger.cxx GetGoodParticles.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
+DICT  = AliL3HoughCint-$(USEPACKAGE).cxx
+DICTH = AliL3HoughCint-$(USEPACKAGE).h
+DICTO = $(OBJDIR)/AliL3HoughCint-$(USEPACKAGE).o
 
 HDRS = $(SRCS:.cxx=.h) AliL3HoughLinkDef.h
-
 OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(DICTO)
 
+ifeq ($(OBJDIR),lib_alone)
+HDRS = $(SRCS:.cxx=.h) 
+OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS))
+endif
+
+
 LEVELSO = $(LIBDIR)/libAliL3Hough.so
 
 all : $(OBJDIR) $(LIBDIR) $(LEVELSO)
@@ -85,7 +89,7 @@ $(LIBDIR) :
 clean :
        rm -f $(OBJDIR)/*.o
        rm -f $(LIBDIR)/libAliL3Hough.so
-       rm $(DICT) $(DICTH) 
+       rm -f $(DICT) $(DICTH) 
 
 so: 
-       rm -f $(LIBDIR)/libAliL3Hough.so
\ No newline at end of file
+       rm -f $(LIBDIR)/libAliL3Hough.so