Changes for independant library of standalone l3 code.

diff --git a/HLT/Makefile.conf b/HLT/Makefile.conf
index 67462607ef3bbc76960386f92977db30113267c5..44fbc3b125837ed54b9ee25ed3f493fa1e11fd7c 100644 (file)
--- a/HLT/Makefile.conf
+++ b/HLT/Makefile.conf
@@ -8,9 +8,9 @@
 #Define whether you want to run with ALIROOT or only ROOT
 #Only one of them should be defined
 ifndef USEPACKAGE
-#USEPACKAGE = ROOT
 USEPACKAGE = ALIROOT
-#USEPACKAGE = NOROOT
+#USEPACKAGE = ROOT
+#USEPACKAGE = STANDALONE
 endif
 
 #Specify the directory where the level3code tree is located.

diff --git a/HLT/comp/Makefile b/HLT/comp/Makefile
index 593e7c4ea0e47ecbfef610fcc8e40380068867be..358891457ddd9cc849887847d3adde4250aa4869 100644 (file)
--- a/HLT/comp/Makefile
+++ b/HLT/comp/Makefile
@@ -45,15 +45,23 @@ else
 INCLUDES += -I/prog/alice/level3/kip/MLUC/include
 endif
 
-SRCS   = AliL3Modeller.cxx AliL3ModelTrack.cxx AliL3Compress.cxx
-
+SRCS =  AliL3Modeller.cxx AliL3ModelTrack.cxx 
 
 DICT  = AliL3CompCint-$(USEPACKAGE).cxx
 DICTH = AliL3CompCint-$(USEPACKAGE).h
 DICTO = $(OBJDIR)/AliL3CompCint-$(USEPACKAGE).o
 
+ifeq ($(USEPACKAGE),ROOT)
+SRCS += AliL3Compress.cxx
 HDRS = $(SRCS:.cxx=.h) bitio.h errhand.h AliL3CompLinkDef.h
 OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(OBJDIR)/bitio.o $(OBJDIR)/errhand.o $(DICTO)
+endif
+
+ifeq ($(USEPACKAGE),ALIROOT)
+SRCS += AliL3Compress.cxx
+HDRS = $(SRCS:.cxx=.h) bitio.h errhand.h AliL3CompLinkDef.h
+OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(OBJDIR)/bitio.o $(OBJDIR)/errhand.o $(DICTO)
+endif
 
 ifeq ($(OBJDIR),lib_alone)
 HDRS = $(SRCS:.cxx=.h) bitio.h errhand.h

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index 09595d7ac0c86fa2431d6e9bac8471f9a79f4f87..39c94c3c5d2bdbbd174afde843f5ff2bcc02fba4 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/Makefile
@@ -47,18 +47,26 @@ 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
+SRCS = AliL3HoughTransformer.cxx AliL3HoughTrack.cxx \
+       AliL3HoughEval.cxx AliL3HoughMerger.cxx AliL3HoughBaseTransformer.cxx \
+       AliL3HoughIntMerger.cxx AliL3HoughGlobalMerger.cxx AliL3HoughTransformerVhdl.cxx \
+       AliL3Histogram.cxx AliL3Histogram1D.cxx AliL3HoughMaxFinder.cxx AliL3Hough.cxx
 
 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) 
@@ -77,12 +85,12 @@ $(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)