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

diff --git a/HLT/src/Makefile b/HLT/src/Makefile
index 6481e2e7a8293131345950bea1f4e5db316aaf74..8e4b3887837150995befd4b0942ae633ae539a52 100644 (file)
--- a/HLT/src/Makefile
+++ b/HLT/src/Makefile
@@ -3,8 +3,10 @@
 # Makefile for HLT code.  #
 #                         #
 # Author: Anders Vestbo   #                    
+# changes by C. Loizides  #
 ###########################
 
+
 ifndef TOPDIR
 TOPDIR = `pwd`/..
 endif
@@ -12,6 +14,8 @@ endif
 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
@@ -22,17 +26,19 @@ 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
+OBJDIR = lib
 endif
 
 ifdef DO_MC
 DEFSTR += -Ddo_mc
 endif
-DEFSTR += $(EXTRADEF)
 
 ifndef NOLOGGING
 DEFSTR += -Duse_logging
 endif
 
+DEFSTR += $(EXTRADEF)
+
 ifdef MLUCDIR
 INCLUDES += -I$(MLUCDIR)/include
 else
@@ -48,9 +54,9 @@ SRCS  = AliL3ConfMapper.cxx AliL3ConfMapPoint.cxx AliLevel3.cxx\
           AliL3MemHandler.cxx  AliL3Benchmark.cxx AliL3Display.cxx
 
 
-DICT = AliL3Cint.cxx
-DICTH = AliL3Cint.h
-DICTO = $(OBJDIR)/AliL3Cint.o
+DICT  = AliL3Cint-$(USEPACKAGE).cxx
+DICTH = AliL3Cint-$(USEPACKAGE).h
+DICTO = $(OBJDIR)/AliL3Cint-$(USEPACKAGE).o
 
 ifeq ($(USEPACKAGE),ROOT)
 HDRS = $(SRCS:.cxx=.h) AliL3LinkDef.h
@@ -62,6 +68,12 @@ HDRS = $(SRCS:.cxx=.h) AliL3FileHandler.h AliL3Evaluate.h AliL3LinkDef.h
 OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(OBJDIR)/AliL3Evaluate.o $(OBJDIR)/AliL3FileHandler.o $(DICTO)
 endif
 
+ifeq ($(OBJDIR),lib_alone)
+HDRS = $(SRCS:.cxx=.h) 
+OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS))
+endif
+
+
 LEVELSO = $(LIBDIR)/libAliL3.so
 
 all : $(OBJDIR) $(LIBDIR) $(LEVELSO) 
@@ -85,33 +97,7 @@ $(LIBDIR) :
 clean :
        rm -f $(OBJDIR)/*.o
        rm -f $(LIBDIR)/libAliL3.so
-       rm -f $(DICT) $(DICTH) 
+       rm -f $(DICT) $(DICTH)
 
 so :
        rm -f $(LIBDIR)/libAliL3.so
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-