X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=Makefile;h=566894996762d0bc8c2e0ba57d2cc6676894ef20;hb=85fb0bf5edaa49bd0d12c05ae471fa343e9b1e7d;hp=db75599759c56275c7669f84a521f06083cd8bc8;hpb=0a1aa611183243f4d79e7049b6ea3dc7507077c8;p=u%2Fmrichter%2FAliRoot.git

diff --git a/Makefile b/Makefile
index db75599759c..56689499676 100644
--- a/Makefile
+++ b/Makefile
@@ -72,13 +72,28 @@ endif
 #               Check if HLT code is there
 
 ifeq ($(ALIHLT_USEPACKAGE),ALIROOT)
-DEFSTR = -Duse_aliroot -Duse_root
+HLTFLAGS = -DALI_HLT -Duse_aliroot -Duse_root
 ifeq ($(ALIHLT_DOMC),true)
-DEFSTR += -Ddo_mc
+HLTFLAGS += -Ddo_mc
 endif
-CXXFLAGS += -DALI_HLT $(DEFSTR) -I$(ALIHLT_TOPDIR)/src
-CINTFLAGS += -DALI_HLT $(DEFSTR) -I$(ALIHLT_TOPDIR)/src
-DEPINC += -DALI_HLT $(DEFSTR) -I$(ALIHLT_TOPDIR)/src
+HLTFLAGS += -I$(ALIHLT_TOPDIR)/src -I$(ALIHLT_TOPDIR)/hough -I$(ALIHLT_TOPDIR)/misc -I$(ALIHLT_TOPDIR)/comp
+CXXFLAGS += $(HLTFLAGS)
+CFLAGS += $(HLTFLAGS)
+CINTFLAGS += $(HLTFLAGS)
+DEPINC += $(HLTFLAGS)
+endif
+##################################################################
+
+##################################################################
+# 
+#               check if DATE is installed
+
+ifdef DATE_ROOT
+DATEFLAGS = -DALI_DATE -D${DATE_SYS} -DDATE_SYS=${DATE_SYS} -Dlong32=${DATE_LONG32} -Dlong64=${DATE_LONG64} -DdatePointer=${DATE_POINTER}
+CXXFLAGS += $(DATEFLAGS)
+CFLAGS += $(DATEFLAGS)
+CINTFLAGS += $(DATEFLAGS)
+DEPINC += $(DATEFLAGS)
 endif
 ##################################################################
 
@@ -92,7 +107,7 @@ endif
 ALIROOTMODULES:= STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS \
       CRT RICH START STRUCT EVGEN RALICE ALIFAST VZERO \
 	  THijing CONTAINERS MEVSIM TMEVSIM THbtp HBTP EMCAL HBTAN \
-      THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR
+      THerwig TEPEMGEN EPEMGEN FASTSIM TPHIC RAW MONITOR DISPLAY ANALYSIS
 
 CERNMODULES:= PDF PYTHIA6 HIJING MICROCERN HERWIG
 
@@ -301,11 +316,13 @@ endif
 
 clean-aliroot:   $(patsubst %,%/module.mk,$(ALIROOTMODULES)) $(patsubst %,clean-%,$(ALIROOTMODULES))
 
-CHECKMODULES := $(ALIROOTMODULES)
+CHECKMODULES := $(MODULES)
 CHECKMODULES := $(filter-out HBTP,$(CHECKMODULES))
 CHECKMODULES := $(filter-out MEVSIM,$(CHECKMODULES))
 CHECKMODULES := $(filter-out EPEMGEN,$(CHECKMODULES))
 CHECKMODULES := $(filter-out TPHIC,$(CHECKMODULES))
+CHECKMODULES := $(filter-out PDF,$(CHECKMODULES))
+CHECKMODULES := $(filter-out MICROCERN,$(CHECKMODULES))
 
 check-all:			$(patsubst %,%/module.mk,$(CHECKMODULES)) $(patsubst %,check-%,$(CHECKMODULES))