Changed definition of TOPDIR

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

diff --git a/HLT/misc/Makefile b/HLT/misc/Makefile
index 2084710f358203a4f5d6b5f6c0a8584c7982f2ca..4eb29bea4a49bbdc25db615b7ee753fbe1978673 100644 (file)
--- a/HLT/misc/Makefile
+++ b/HLT/misc/Makefile
@@ -3,29 +3,18 @@
 # Makefile for HLT code.  #
 #                         #
 # Author: Anders Vestbo   #                    
+# changes by C. Loizides  #
 ###########################
 
-ifndef USEPACKAGE
-#USEPACKAGE = ROOT
-USEPACKAGE = ALIROOT
+ifndef TOPDIR
+TOPDIR = $(shell pwd)/..
 endif
 
-#used if USEPACKAGE=anything else
-DEFSTR = -Dno_root
-
-CXX         = g++
-LD          = g++
-CXXFLAGS    = -O2 -Wall -fPIC
-LDFLAGS     = -O2
-SOFLAGS     = -shared
+include $(TOPDIR)/Makefile.conf
 
-ifndef TOPDIR
-TOPDIR = $(HOME)/level3code
-endif
-ifndef LIBDIR
-LIBDIR = $(LEVEL3)/lib_$(USERNAME)
-endif
-OBJDIR = lib
+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
@@ -35,32 +24,42 @@ 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
+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   = AliTransBit.cxx AliL3AltroMemHandler.cxx
+SRCS   = AliL3TransBit.cxx AliL3AltroMemHandler.cxx AliL3DataHandler.cxx AliL3VHDLClusterFinder.cxx \
+          AliL3FFloat.cxx AliL3Stopwatch.cxx
 
-DICT = AliL3MiscCint.cxx
-DICTH = AliL3MiscCint.h
-DICTO = $(OBJDIR)/AliL3MiscCint.o
+DICT  = AliL3MiscCint-$(USEPACKAGE).cxx
+DICTH = AliL3MiscCint-$(USEPACKAGE).h
+DICTO = $(OBJDIR)/AliL3MiscCint-$(USEPACKAGE).o
 
 HDRS = $(SRCS:.cxx=.h) AliL3MiscLinkDef.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)/libAliL3Misc.so
 
 all : $(OBJDIR) $(LIBDIR) $(LEVELSO) 
@@ -70,7 +69,7 @@ $(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 $@ $<
@@ -88,32 +87,3 @@ clean :
 
 so :
        rm -f $(LIBDIR)/libAliL3Misc.so
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-