Minor updates

diff --git a/HLT/comp/Makefile b/HLT/comp/Makefile
index a76ee631f57ef5ce2511da4b80b0b0c46e8f4afd..171686538259f5ed3c2e3d2827266efc45ff8f8f 100644 (file)
--- a/HLT/comp/Makefile
+++ b/HLT/comp/Makefile
@@ -1,8 +1,9 @@
-#
-# Makefile for ROOT version of HLT code.
-#
-# Author: Anders Vestbo                       
-#
+#$Id$
+###########################
+# Makefile for HLT code.  #
+#                         #
+# Author: Anders Vestbo   #                    
+###########################
 
 CXX         = g++
 LD          = g++
@@ -11,7 +12,7 @@ LDFLAGS     = -O2
 SOFLAGS     = -shared
 
 TOPDIR = $(HOME)/level3code
-OBJDIR = tgt_Linux
+OBJDIR = lib
 LIBDIR = $(LEVEL3)/lib_$(USERNAME)
 
 SRCS   = AliL3Modeller.cxx AliL3ModelTrack.cxx AliL3Compress.cxx
@@ -42,7 +43,6 @@ $(OBJDIR)/%.o : %.cxx
 
 $(OBJDIR) : 
        test ! -e $(OBJDIR) && mkdir -p $(OBJDIR)
-       test ! -e $(LIBDIR) && mkdir -p $(LIBDIR)
 
 $(OBJDIR)/bitio.o : bitio.c
        $(CXX) -c -o $(OBJDIR)/bitio.o bitio.c

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index 31269dd76b6bf8b7695bf24f8c22a1811a84c542..a7454612f7bc9a79163253c6616d083f84bb8815 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/Makefile
@@ -1,8 +1,9 @@
-#
-# Makefile for ROOT (no aliroot) version of HLT code.
-#
-# Author: Anders Vestbo                       
-#
+#$Id$
+###########################
+# Makefile for HLT code.  #
+#                         #
+# Author: Anders Vestbo   #                    
+###########################
 
 CXX         = g++
 LD          = g++
@@ -11,7 +12,8 @@ LDFLAGS     = -O2
 SOFLAGS     = -shared
 
 TOPDIR = $(HOME)/level3code
-OBJDIR = tgt_Linux
+OBJDIR = lib
+LIBDIR = $(LEVEL3)/lib_$(USERNAME)
 
 SRCS   = AliL3HoughTransformer.cxx AliL3Hough.cxx AliL3HoughTrack.cxx\
          AliL3HoughMaxFinder.cxx AliL3HoughEval.cxx AliL3HoughMerger.cxx \
@@ -26,7 +28,7 @@ HDRS = $(SRCS:.cxx=.h) AliL3HoughLinkDef.h
 
 OBJS = $(patsubst %.cxx,$(OBJDIR)/%.o,$(SRCS)) $(DICTO)
 
-LEVELSO = $(LEVEL3)/lib_$(USERNAME)/libAliL3Hough.so
+LEVELSO = $(LIBDIR)/libAliL3Hough.so
 
 all : $(OBJDIR) $(LEVELSO)
 
@@ -46,5 +48,8 @@ $(OBJDIR) :
 
 clean :
        rm -f $(OBJDIR)/*.o
-       rm -f $(LEVEL3)/lib_$(USERNAME)/libAliL3Hough.so
-       rm $(DICT) $(DICTH) 
\ No newline at end of file
+       rm -f $(LIBDIR)/libAliL3Hough.so
+       rm $(DICT) $(DICTH) 
+
+so: 
+       rm -f $(LIBDIR)/libAliL3Hough.so
\ No newline at end of file

diff --git a/HLT/src/Makefile b/HLT/src/Makefile
index 11bc72c5ac2a291862546750ddb0fd1e0b3bd37a..548c90cb1e7f6b4d24c788b8765db8eb4e337268 100644 (file)
--- a/HLT/src/Makefile
+++ b/HLT/src/Makefile
@@ -15,7 +15,7 @@ LDFLAGS     = -O2
 SOFLAGS     = -shared
 
 TOPDIR = $(HOME)/level3code
-OBJDIR = tgt_Linux
+OBJDIR = lib
 LIBDIR = $(LEVEL3)/lib_$(USERNAME)
 
 ifeq ($(USEPACKAGE),ROOT) 
@@ -64,7 +64,6 @@ $(OBJDIR)/%.o : %.cxx
 
 $(OBJDIR) : 
        test ! -e $(OBJDIR) && mkdir -p $(OBJDIR)
-       test ! -e $(LIBDIR) && mkdir -p $(LIBDIR)
 
 clean :
        rm -f $(OBJDIR)/*.o