PACKBLIBS := $(ROOTCLIBS) $(SYSLIBS)
+ELIBS:= MONITOR STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation MUONcore
+
ifdef DATE_ROOT
-PACKBLIBS += $(shell date-config --monitorlibs)
+PACKBLIBS += $(DMONLIBS)
ELIBSDIR:=
-ELIBS:=STEERBase ESD AOD CDB STEER RAWDatabase RAWDatarec RAWDatasim TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONsim MUONrec MUONbase MUONgeometry MUONraw MUONcalib MUONmapping MUONtrigger MUONevaluation
+
EINCLUDE+= ${DATE_COMMON_DEFS} ${DATE_MONITOR_DIR}
+ifdef DIMDIR
+
+EINCLUDE += $(DIMDIR)/dim
+ELIBS += dim
+ELIBSDIR += $(DIMDIR)/$(ODIR)
+
+endif
+
endif
ifneq (,$(findstring macosx,$(ALICE_TARGET)))
-PACKLDFLAGS:=$(LDFLAGS) $(ELIBS:%=-Wl,-u,_G__cpp_setupG__%)
+PACKLDFLAGS:=$(LDFLAGS) $($(filter-out dim,$(ELIBS)):%=-Wl,-u,_G__cpp_setupG__%)
endif