X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=Makefile;h=bef26fbd606d7901f0d58a0e9f52c4a443a7d962;hp=5424029901d647bd80abe073ea1061328cf010d4;hb=131857266ba83adb4edcc020ef40893dfd3f1832;hpb=0b35d9321a67999dcfbe21c2aa70e2e0c7ca655f diff --git a/Makefile b/Makefile index 5424029901d..bef26fbd606 100644 --- a/Makefile +++ b/Makefile @@ -58,9 +58,8 @@ 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} -I${DATE_COMMON_DEFS} -I${DATE_MONITOR_DIR} +ifneq ($(shell date-config 2>&1 | grep -i usage),) +DATEFLAGS = -DALI_DATE $(shell date-config --cflags | tr \" \') CXXFLAGS += $(DATEFLAGS) CFLAGS += $(DATEFLAGS) CINTFLAGS += $(DATEFLAGS) @@ -89,6 +88,7 @@ ROOTCLIBS := $(shell $(ROOTCONFIG) --glibs) \ -lGeom \ -lTreePlayer \ -lXMLIO \ + -lXMLParser \ -lProof \ -lProofPlayer \ -lMLP \ @@ -274,6 +274,14 @@ endif aliroot: alilibs $(BINPATH) $(ALLEXECS) +ALIRECO.par: macros/loadlibsrec.C STEER/PROOF-INF.ALIRECO/SETUP.C + $(MUTE)echo "***** Creating package archive" $@ "*****" + $(MUTE)rm -rf ALIRECO + $(MUTE)mkdir -p ALIRECO/PROOF-INF + $(MUTE)cat $^ > ALIRECO/PROOF-INF/SETUP.C + (tar cfzh $@ ALIRECO 2> /dev/null && echo "Package archive" $@ "created in" $(PWD)/$@) || (tar cfzh /tmp/$@ ALIRECO 2> /dev/null && echo "Package archive" $@ "created in /tmp/"$@) + $(MUTE)rm -rf ALIRECO + ROOTALIBDIR=$(shell root-config --libdir) ALIMDCSPECFILE=$(RAWDIRO)/alimdc.spec @@ -354,7 +362,7 @@ alimdc-static: $(LIBPATH) $(BINPATH) $(RAWDatabaseALIB) $(MDCALIB) $(ESDALIB) $( $(LIBPATH)/libAliMDC.a \ $(ROOTALIBDIR)/libRoot.a \ $(ROOTALIBDIR)/libfreetype.a $(ROOTALIBDIR)/libpcre.a \ - -ldl + -pthread -ldl alilibs-static: $(LIBPATH) modules $(ALLALIBS)