New topdir Makefile

diff --git a/HLT/comp/Makefile b/HLT/comp/Makefile
index 79e42f8694d58572f5b68b7a790f6f178b87ac2b..5716bc22cd6633f92a0219cfb4d4c84bad7ddc5a 100644 (file)
--- a/HLT/comp/Makefile
+++ b/HLT/comp/Makefile
@@ -5,27 +5,13 @@
 # Author: Anders Vestbo   #                    
 ###########################
 
-ifndef USEPACKAGE
-#USEPACKAGE = ROOT
-USEPACKAGE = ALIROOT
+ifndef TOPDIR
+TOPDIR = `pwd`/..
 endif
 
-#used if USEPACKAGE=anything else
-DEFSTR = -Dno_root
-
-CXX         = g++
-LD          = g++
-CXXFLAGS    = -O2 -Wall -fPIC -Woverloaded-virtual
-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
 
 ifeq ($(USEPACKAGE),ROOT) 
 INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp
@@ -38,10 +24,10 @@ INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/co
 DEFSTR = -Duse_aliroot -Duse_root
 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

diff --git a/HLT/hough/Makefile b/HLT/hough/Makefile
index e5882bbaf1624ce64d62154c9ad5a1d044ea63ae..24ab3788fc55cbac3821e1c777b2905a98fc5322 100644 (file)
--- a/HLT/hough/Makefile
+++ b/HLT/hough/Makefile
@@ -5,27 +5,13 @@
 # Author: Anders Vestbo   #                    
 ###########################
 
-ifndef USEPACKAGE
-#USEPACKAGE = ROOT
-USEPACKAGE = ALIROOT
+ifndef TOPDIR
+TOPDIR = `pwd`/..
 endif
 
-#used if USEPACKAGE=anything else
-DEFSTR = -Dno_root
-
-CXX         = g++
-LD          = g++
-CXXFLAGS    = -O2 -Wall -fPIC -Woverloaded-virtual
-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
 
 ifeq ($(USEPACKAGE),ROOT) 
 INCLUDES = -I$(ROOTSYS)/include -I$(TOPDIR)/hough -I$(TOPDIR)/src -I$(TOPDIR)/comp -I$(TOPDIR)/misc
@@ -39,7 +25,9 @@ DEFSTR = -Duse_aliroot -Duse_root
 endif
 
 #Save the particle id's
-#DEFSTR += -Ddo_mc
+ifdef DO_MC
+DEFSTR += -Ddo_mc
+endif
 DEFSTR += $(EXTRADEF)
 
 #Use logging classes