Changes from Constantin:

a) Makefile
The changes are: treatment of ROOT to be external/system
treatment for warnings (using -isystem)

b) Makefile
Since rootcint produces obsolete string code I propose
to add -Wno-write-strings to CXXFLAGSNO. I have talked
long time ago (6 months maybe or more) to Phillipe,
but I dont think he fixed cint.

c) Makefile
Different logic to implement whether date-config is there,
so that no annoying output from the stderr of which is
produced.

d) build/module.tpl
The changes in module.tpl use ${MUTE }to avoid the
printout of several lines when not requested with ALIVERBOSE=1.

e) JETAN
Patch for JETAN to treat FASTJET external like ROOT.

Changes from Marco:

Fix for bug #71073: Relative path for 'include' in dependency files

diff --git a/JETAN/libFASTJETAN.pkg b/JETAN/libFASTJETAN.pkg
index 1f0b3b766453cab4bd9b086abc3109c52e4eb472..3a0e6277b8068714c82594c22706d981d67d3d0b 100644 (file)
--- a/JETAN/libFASTJETAN.pkg
+++ b/JETAN/libFASTJETAN.pkg
@@ -2,14 +2,13 @@
 
 SRCS =  AliFastJetFinder.cxx AliFastJetHeaderV1.cxx AliFastJetInput.cxx AliJetBkg.cxx\
         AliSISConeJetFinder.cxx AliSISConeJetHeader.cxx AliAnalysisTaskJetCluster.cxx
+
 ifneq ($(FASTJET_ROOT),)
-        EINCLUDE += $(FASTJET_ROOT)/include            
+       EDEFINE =-isystem$(FASTJET_ROOT)/include
 else   
-       FASTJET_ROOT=$(ALICE_ROOT)/JETAN
-        EINCLUDE += $(FASTJET_ROOT)/fastjet            
+       EDEFINE = -isystem$(ALICE_ROOT)/JETAN/fastjet
 endif
 
-
 HDRS:= $(SRCS:.cxx=.h) 
 DHDR= FASTJETANLinkDef.h
 
@@ -20,4 +19,3 @@ PACKSOFLAGS:= $(SOFLAGS) -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) \
                          -lSTEERBase -lESD -lAOD -lANALYSIS -lANALYSISalice -lJETAN \
                          -L$(ROOTLIBDIR) -lEG -lGeom
 endif
-

diff --git a/JETAN/libJETAN.pkg b/JETAN/libJETAN.pkg
index 8fde5babf147b1a51e9f08b129f11d40ec419c37..b175704dae7f837a3e55106f36821256b198382c 100644 (file)
--- a/JETAN/libJETAN.pkg
+++ b/JETAN/libJETAN.pkg
@@ -33,6 +33,12 @@ SRCS =       AliJetHeader.cxx \
 HDRS:= $(SRCS:.cxx=.h) 
 DHDR= JETANLinkDef.h
 
+ifneq ($(FASTJET_ROOT),)
+       EDEFINE =-isystem$(FASTJET_ROOT)/include
+else   
+       EDEFINE = -isystem$(ALICE_ROOT)/JETAN/fastjet
+endif
+
 EINCLUDE:= ANALYSIS
 
 ifeq (win32gcc,$(ALICE_TARGET))

diff --git a/Makefile b/Makefile
index 2cf5490c3859fe050dd8533616dab169be1d18e6..bd20e4919c1d2928f4373cc90d3da3d83e49b0a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,22 +65,18 @@ endif
 #-------------------------------------------------------------------------------
 # Check if DATE is installed
 
-ifneq ($(shell which date-config | grep "^/"),)
-DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
-CXXFLAGS  += $(DATEFLAGS)
-CFLAGS    += $(DATEFLAGS)
-CINTFLAGS += $(DATEFLAGS)
-DEPINC    += $(DATEFLAGS)
-DMONLIBS  := $(shell date-config --monitorlibs)
-else
+ifeq ($(shell which date-config 2>/dev/null),)
 DATEFLAGS := -D`uname` -DDATE_SYS=`uname` -Dlong32='int' \
              -Dlong64='long long' -DdatePointer='long'
+DMONLIBS  :=
+else 
+DATEFLAGS := -DALI_DATE $(shell date-config --cflags | tr \" \')
+DMONLIBS  := $(shell date-config --monitorlibs)
+endif
 CXXFLAGS  += $(DATEFLAGS)
 CFLAGS    += $(DATEFLAGS)
 CINTFLAGS += $(DATEFLAGS)
 DEPINC    += $(DATEFLAGS)
-DMONLIBS  :=
-endif
 
 #-------------------------------------------------------------------------------
 # Add warning flags if any
@@ -171,11 +167,11 @@ MODDIRS := $(MODULES)
 # Default include dirs for C++, Fortran, Cint, and dependencies
 # The module directory will be added by each module
 
-GENINC     := -I$(ALICE_ROOT)/include -I$(shell root-config --incdir)
-RCFLAGS    := $(shell root-config --cflags)
+GENINC     := -Iinclude -isystem$(shell root-config --incdir)
+RCFLAGS    := $(shell root-config --auxcflags) 
 RLFLAGS    := $(shell root-config --ldflags)
 CXXFLAGS   += $(GENINC) $(RCFLAGS)
-CXXFLAGSNO += $(GENINC) $(RCFLAGS)
+CXXFLAGSNO += $(GENINC) $(RCFLAGS) -Wno-write-strings
 CFLAGS     += $(GENINC) $(RCFLAGS)
 CINTFLAGS  += $(GENINC) $(RCFLAGS)
 FFLAGS    += $(RCFLAGS)

diff --git a/build/module.tpl b/build/module.tpl
index 50d4b558bbf734262fbcf715ede4370cf642f5d5..b470253402d7ed86ab115ce1e1f66177b56f5c2f 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -185,7 +185,7 @@ $(@PACKAGE@LIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
 ifndef ALIQUIET
          @echo "***** Linking library $@ *****"
 endif
-         \rm -f "$(CURDIR)"/$@ ;\
+         ${MUTE}\rm -f "$(CURDIR)"/$@ ;\
          cd $(@MODULE@DIRO) ;\
          $(SHLD) $(@PACKAGE@SOFLAGS) -o "$(CURDIR)"/$@ $(patsubst $(@MODULE@DIRO)/%,%,$(@PACKAGE@O) $(@PACKAGE@DO))  $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(SHLIB);\
          chmod a-w "$(CURDIR)"/$@ ;\
@@ -364,7 +364,7 @@ $(@PACKAGE@SML) : $(MODDIRZ)/%.smell : $(MODDIRZ)/%_cxx.ml $(MODDIRZ)/%_h.ml
 # targets to create .par archives (jgrosseo)
 @PACKAGE@.par: $(patsubst %,@MODULE@/@PACKAGE@/%,$(filter-out dict.%, $(HDRS) $(SRCS) $(DHDR) $(PKGFILE) $(FSRCS) Makefile Makefile.arch lib@PACKAGE@.pkg PROOF-INF))
        @echo "Creating archive" $@ ...
-       @cd @MODULE@; (tar cfzh ../$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in" $(PWD)/$@) || (tar cfzh /tmp/$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in /tmp/"$@)
+       @cd @MODULE@; (tar --exclude-vcs -czhf ../$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in" $(PWD)/$@) || (tar --exclude-vcs -czhf /tmp/$@ @PACKAGE@ 2> /dev/null && echo "package" $@ "created in /tmp/"$@)
        @rm -rf @MODULE@/@PACKAGE@
 
 @MODULE@/@PACKAGE@/Makefile: @MODULE@/Makefile