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

diff --git a/HLT/comp/Makefile b/HLT/comp/Makefile
index 5716bc22cd6633f92a0219cfb4d4c84bad7ddc5a..593e7c4ea0e47ecbfef610fcc8e40380068867be 100644 (file)
--- a/HLT/comp/Makefile
+++ b/HLT/comp/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,6 +26,7 @@ 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 -Duse_root
+OBJDIR = lib
 endif
 
 ifdef DO_MC
@@ -32,6 +37,8 @@ ifndef NOLOGGING
 DEFSTR += -Duse_logging
 endif
 
+DEFSTR += $(EXTRADEF)
+
 ifdef MLUCDIR
 INCLUDES += -I$(MLUCDIR)/include
 else
@@ -40,19 +47,24 @@ endif
 
 SRCS   = AliL3Modeller.cxx AliL3ModelTrack.cxx AliL3Compress.cxx
 
-DICT = AliL3CompCint.cxx
-DICTH = AliL3CompCint.h
-DICTO = $(OBJDIR)/AliL3CompCint.o
 
-HDRS = $(SRCS:.cxx=.h) bitio.h errhand.h AliL3CompLinkDef.h
+DICT  = AliL3CompCint-$(USEPACKAGE).cxx
+DICTH = AliL3CompCint-$(USEPACKAGE).h
+DICTO = $(OBJDIR)/AliL3CompCint-$(USEPACKAGE).o
 
+HDRS = $(SRCS:.cxx=.h) bitio.h errhand.h AliL3CompLinkDef.h
 OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(OBJDIR)/bitio.o $(OBJDIR)/errhand.o $(DICTO)
 
+ifeq ($(OBJDIR),lib_alone)
+HDRS = $(SRCS:.cxx=.h) bitio.h errhand.h
+OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(OBJDIR)/bitio.o $(OBJDIR)/errhand.o
+endif
+
+
 LEVELSO = $(LIBDIR)/libAliL3Comp.so
 
 all : $(OBJDIR) $(LIBDIR) $(LEVELSO)
 
-
 $(LEVELSO) : $(OBJS)
        $(LD) $(SOFLAGS) $(LDFLAGS) $^ -o $@
 
@@ -60,7 +72,6 @@ $(DICT) : $(HDRS)
        @echo "Generating dictionary..."
        @rootcint -f $(DICT) -c $(INCLUDES) $(HDRS)
 
-
 $(OBJDIR)/%.o : %.cxx 
        $(CXX) $(CXXFLAGS) $(DEFSTR) -c $(INCLUDES) -o $@ $<
 
@@ -72,12 +83,13 @@ $(LIBDIR) :
 
 $(OBJDIR)/bitio.o : bitio.c
        $(CXX) -c -o $(OBJDIR)/bitio.o bitio.c
+
 $(OBJDIR)/errhand.o : errhand.c
        $(CXX) -c -o $(OBJDIR)/errhand.o errhand.c
 
 clean :
        rm -f $(OBJDIR)/*.o
        rm -f $(LIBDIR)/libAliL3Comp.so
-       rm -f $(DICT) $(DICTH) 
+       rm -f $(DICT) $(DICTH)
 so :
-       rm -f $(LIBDIR)/libAliL3Comp.so
\ No newline at end of file
+       rm -f $(LIBDIR)/libAliL3Comp.so

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index 24ab3788fc55cbac3821e1c777b2905a98fc5322..09595d7ac0c86fa2431d6e9bac8471f9a79f4f87 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/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 -I$(TOPDIR)/misc
@@ -22,19 +26,21 @@ 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
+OBJDIR = lib
 endif
 
 #Save the particle id's
 ifdef DO_MC
 DEFSTR += -Ddo_mc
 endif
-DEFSTR += $(EXTRADEF)
 
 #Use logging classes
 ifndef NOLOGGING
 DEFSTR += -Duse_logging
 endif
 
+DEFSTR += $(EXTRADEF)
+
 ifdef MLUCDIR
 INCLUDES += -I$(MLUCDIR)/include
 else
@@ -47,13 +53,19 @@ SRCS        = AliL3HoughTransformer.cxx AliL3Hough.cxx AliL3HoughTrack.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)

diff --git a/HLT/misc/Makefile b/HLT/misc/Makefile
index 312bcb27a2e520e5bb7a7bb75865601142756b08..727b90b3b72424df4acae1e78dd5371c7be5c8ee 100644 (file)
--- a/HLT/misc/Makefile
+++ b/HLT/misc/Makefile
@@ -3,6 +3,7 @@
 # Makefile for HLT code.  #
 #                         #
 # Author: Anders Vestbo   #                    
+# changes by C. Loizides  #
 ###########################
 
 ifndef TOPDIR
@@ -12,6 +13,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,6 +25,7 @@ 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
@@ -32,6 +36,8 @@ ifndef NOLOGGING
 DEFSTR += -Duse_logging
 endif
 
+DEFSTR += $(EXTRADEF)
+
 ifdef MLUCDIR
 INCLUDES += -I$(MLUCDIR)/include
 else
@@ -40,13 +46,19 @@ endif
 
 SRCS   = AliTransBit.cxx AliL3AltroMemHandler.cxx AliL3DataHandler.cxx AliL3VHDLClusterFinder.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) 
@@ -74,25 +86,3 @@ clean :
 
 so :
        rm -f $(LIBDIR)/libAliL3Misc.so
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-