Minor changes at new Top Makefile.

diff --git a/HLT/Makefile b/HLT/Makefile
index cb2ce353897ad7f426e264733daad0f30aefc003..38607a3162fb9871ad3d276d6d7bc2f15e285a9f 100644 (file)
--- a/HLT/Makefile
+++ b/HLT/Makefile
@@ -5,10 +5,14 @@
 # Author: Anders Vestbo   #                    
 ###########################
 
 # Author: Anders Vestbo   #                    
 ###########################
 

-MAKEDIRS = src hough comp programs misc
+LIBS = src hough comp misc
+MAKEDIRS = $(LIBS) programs

 
 all:
 
 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:
 
 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 41831890bd7a89d12ce21afa5090477b1c880958..67462607ef3bbc76960386f92977db30113267c5 100644 (file)
--- a/HLT/Makefile.conf
+++ b/HLT/Makefile.conf
@@ -20,7 +20,6 @@ endif
 ifndef LIBDIR
 LIBDIR = $(LEVEL3)/lib_$(USERNAME)
 endif
 ifndef LIBDIR
 LIBDIR = $(LEVEL3)/lib_$(USERNAME)
 endif

-OBJDIR = lib

 
 #Switch on/off HLT logging classes
 #NOLOGGING = 1
 
 #Switch on/off HLT logging classes
 #NOLOGGING = 1


@@ -31,6 +30,7 @@ OBJDIR = lib
 
 CXX         = g++
 LD          = g++
 
 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
+