Minor changes at new Top Makefile.

[u/mrichter/AliRoot.git] / HLT / misc / Makefile

diff --git a/HLT/misc/Makefile b/HLT/misc/Makefile
index 8d07a726635763d8174347b56a61c251c4050397..312bcb27a2e520e5bb7a7bb75865601142756b08 100644 (file)
--- a/HLT/misc/Makefile
+++ b/HLT/misc/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
-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
 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