From b1f97365965991a156557685db5a8b3653afc23f Mon Sep 17 00:00:00 2001
From: loizides <loizides@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Tue, 2 Jul 2002 11:26:40 +0000
Subject: [PATCH] Minor changes at new Top Makefile.

---
 HLT/Makefile      | 10 +++++++---
 HLT/Makefile.conf |  8 ++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/HLT/Makefile b/HLT/Makefile
index cb2ce353897..38607a3162f 100644
--- a/HLT/Makefile
+++ b/HLT/Makefile
@@ -5,10 +5,14 @@
 # Author: Anders Vestbo   #                    
 ###########################
 
-MAKEDIRS = src hough comp programs misc
+LIBS = src hough comp misc
+MAKEDIRS = $(LIBS) programs
 
 all:
-	for i in $(MAKEDIRS) ; do cd $$i && make ; cd .. ; done
+	for i in $(MAKEDIRS) ; do cd $$i && $(MAKE) ; cd .. ; done
+
+libs: 
+	for i in $(LIBS) ; do cd $$i && $(MAKE) ; cd .. ; done
 
 clean:
-	for i in $(MAKEDIRS) ; do cd $$i && make clean ; cd .. ; done
\ No newline at end of file
+	for i in $(MAKEDIRS) ; do cd $$i && $(MAKE) clean ; cd .. ; done
diff --git a/HLT/Makefile.conf b/HLT/Makefile.conf
index 41831890bd7..67462607ef3 100644
--- a/HLT/Makefile.conf
+++ b/HLT/Makefile.conf
@@ -20,7 +20,6 @@ endif
 ifndef LIBDIR
 LIBDIR = $(LEVEL3)/lib_$(USERNAME)
 endif
-OBJDIR = lib
 
 #Switch on/off HLT logging classes
 #NOLOGGING = 1
@@ -31,6 +30,7 @@ OBJDIR = lib
 
 CXX         = g++
 LD          = g++
-CXXFLAGS    = -O2 -Wall -fPIC -Woverloaded-virtual
-LDFLAGS     = -O2
-SOFLAGS     = -shared
\ No newline at end of file
+CXXFLAGS    = -O2 -Wall -fPIC -Woverloaded-virtual $(EXTRACXXFLAGS)
+LDFLAGS     = -O2 $(EXTRALDFLAGS)
+SOFLAGS     = -shared
+
-- 
2.31.1