From Axel:

in case we have gmake >= 3.80 we can use the new | (order) syntax where
all dependencies after the | are required to be there but not trigger
execution of the rule. This should greatly enhance the build experience
on Win32 and AIX (platforms that need the EXPLICITLINK option).


git-svn-id: http://root.cern.ch/svn/root/trunk@13584 27541ba8-7e3a-0410-8455-c3a389f83636

Makefile

@@ -314,8 +314,12 @@ CORELIB      := $(LPATH)/libCore.$(SOEXT)
 
 ifeq ($(EXPLICITLINK),yes)
 MAINLIBS      = $(CORELIB) $(CINTLIB)
+MAKE_VERSION_MAJOR = $(word 1,$(subst ., ,$(MAKE_VERSION)))
+MAKE_VERSION_MINOR = $(word 2,$(subst ., ,$(MAKE_VERSION)))
+ORDER_       := $(shell test $(MAKE_VERSION_MAJOR) -gt 3 -o $(MAKE_VERSION_MAJOR) -eq 3 -a $(MAKE_VERSION_MINOR) -ge 80 && echo '|')
 else
 MAINLIBS      =
+ORDER_        =
 endif
 
 ##### all #####

alien/Module.mk

@@ -36,7 +36,7 @@ INCLUDEFILES += $(ALIENDEP)
 include/%.h:    $(ALIENDIRI)/%.h
 		cp $< $@
 
-$(ALIENLIB):    $(ALIENO) $(ALIENDO) $(MAINLIBS) $(ALIENLIBDEP)
+$(ALIENLIB):    $(ALIENO) $(ALIENDO) $(ORDER_) $(MAINLIBS) $(ALIENLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libRAliEn.$(SOEXT) $@ "$(ALIENO) $(ALIENDO)" \
 		   "$(ALIENLIBEXTRA) $(ALIENLIBDIR) $(ALIENCLILIB)"

asimage/Module.mk

@@ -191,7 +191,7 @@ endif
 
 ##### libASImage #####
 $(ASIMAGELIB):  $(ASIMAGEO) $(ASIMAGEDO) $(ASTEPDEP) $(FREETYPEDEP) \
-                $(MAINLIBS) $(ASIMAGELIBDEP)
+                $(ORDER_) $(MAINLIBS) $(ASIMAGELIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libASImage.$(SOEXT) $@ \
 		   "$(ASIMAGEO) $(ASIMAGEDO)" \
@@ -208,7 +208,7 @@ $(ASIMAGEDO):   $(ASIMAGEDS) $(ASTEPLIB)
 
 ##### libASImageGui #####
 $(ASIMAGEGUILIB):  $(ASIMAGEGUIO) $(ASIMAGEGUIDO) $(ASTEPDEP) $(FREETYPEDEP) \
-                   $(MAINLIBS) $(ASIMAGEGUILIBDEP)
+                   $(ORDER_) $(MAINLIBS) $(ASIMAGEGUILIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libASImageGui.$(SOEXT) $@ \
 		   "$(ASIMAGEGUIO) $(ASIMAGEGUIDO)" \
@@ -225,7 +225,7 @@ $(ASIMAGEGUIDO): $(ASIMAGEGUIDS) $(ASTEPLIB)
 
 ##### libASPluginGS #####
 $(ASIMAGEGSLIB):  $(ASIMAGEGSO) $(ASIMAGEGSDO) $(ASTEPDEP) $(FREETYPEDEP) \
-                  $(MAINLIBS) $(ASIMAGEGSLIBDEP)
+                  $(ORDER_) $(MAINLIBS) $(ASIMAGEGSLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libASPluginGS.$(SOEXT) $@ \
 		   "$(ASIMAGEGSO) $(ASIMAGEGSDO)" \

auth/Module.mk

@@ -55,7 +55,7 @@ INCLUDEFILES += $(RAUTHDEP)
 include/%.h:    $(AUTHDIRI)/%.h
 		cp $< $@
 
-$(RAUTHLIB):    $(RAUTHO) $(RAUTHDO) $(MAINLIBS) $(RAUTHLIBDEP)
+$(RAUTHLIB):    $(RAUTHO) $(RAUTHDO) $(ORDER_) $(MAINLIBS) $(RAUTHLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libRootAuth.$(SOEXT) $@ "$(RAUTHO) $(RAUTHDO)" \
 		   "$(RAUTHLIBEXTRA) $(EXTRA_RAUTHLIBS)"

base/Module.mk

@@ -64,6 +64,10 @@ INCLUDEFILES += $(BASEDEP)
 include/%.h:    $(BASEDIRI)/%.h
 		cp $< $@
 
+# Explicitely state this dependency.
+# rmkdepend does not pick it up if $(COMPILEDATA) doesn't exist yet.
+base/src/TSystem.d base/src/TSystem.o: $(COMPILEDATA)
+
 $(BASEDS1):     $(BASEH1) $(BASEL1) $(ROOTCINTTMP)
 		@echo "Generating dictionary $@..."
 		$(ROOTCINTTMP) -f $@ -c $(BASEH1) $(BASEL1)

chirp/Module.mk

@@ -35,7 +35,7 @@ INCLUDEFILES += $(CHIRPDEP)
 include/%.h:    $(CHIRPDIRI)/%.h
 		cp $< $@
 
-$(CHIRPLIB):    $(CHIRPO) $(CHIRPDO) $(MAINLIBS)
+$(CHIRPLIB):    $(CHIRPO) $(CHIRPDO) $(ORDER_) $(MAINLIBS)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libChirp.$(SOEXT) $@ "$(CHIRPO) $(CHIRPDO)" \
 		   "$(CHIRPLIBEXTRA) $(CHIRPLIBDIR) $(CHIRPCLILIB)"

cintex/Module.mk

@@ -28,8 +28,10 @@ else
 CINTEXPY     := $(subst $(MODDIR)/python,$(LPATH),$(CINTEXPYS))
 $(LPATH)/%.py: $(MODDIR)/python/%.py; cp $< $@
 endif
+ifneq ($(BUILDPYTHON),no)
 CINTEXPYC    := $(CINTEXPY:.py=.pyc)
 CINTEXPYO    := $(CINTEXPY:.py=.pyo)
+endif
 
 # used in the main Makefile
 ALLHDRS      += $(patsubst $(MODDIRI)/Cintex/%.h,include/Cintex/%.h,$(CINTEXH))
@@ -61,7 +63,7 @@ include/Cintex/%.h: $(CINTEXDIRI)/Cintex/%.h
 %.pyc: %.py;    python -c 'import py_compile; py_compile.compile( "$<" )'
 %.pyo: %.py;    python -O -c 'import py_compile; py_compile.compile( "$<" )'
 
-$(CINTEXLIB):   $(CINTEXO) $(MAINLIBS) $(CINTEXLIBDEP) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO)
+$(CINTEXLIB):   $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) $(ORDER_) $(MAINLIBS) $(CINTEXLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)"      \
 		"$(SOFLAGS)" libCintex.$(SOEXT) $@ "$(CINTEXO)" \
 		"$(CINTEXLIBEXTRA)"
@@ -89,16 +91,15 @@ distclean-cintex: clean-cintex
 distclean::     distclean-cintex
 
 # test suite
-
-check-cintex: $(REFLEXLIB) $(CINTEXLIB) $(TESTLIB) 
+check-cintex: $(REFLEXLIB) $(CINTEXLIB) $(TESTLIB)
 		export ROOTSYS=`pwd`; root
 
 lib/libtest_%Rflx.$(SOEXT) : $(TESTLIBD)/%_rflx.o
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" "$(SOFLAGS)" $@ $@ $< $(REFLEXLL)
 
-%_rflx.o : %_rflx.cpp
+%_rflx.o: %_rflx.cpp
 		$(CXX) $(OPT) $(CXXFLAGS) -c $< -o $@
 
-$(TESTLIBS) :
+$(TESTLIBS):
 		cd $(TESTLIBD); $(GENREFLEXX) CintexTest.h -s selection.xml -I../../../include
 

clarens/Module.mk

@@ -36,7 +36,7 @@ INCLUDEFILES += $(CLARENSDEP)
 include/%.h:    $(CLARENSDIRI)/%.h
 		cp $< $@
 
-$(CLARENSLIB):  $(CLARENSO) $(CLARENSDO) $(MAINLIBS) $(CLARENSLIBDEP)
+$(CLARENSLIB):  $(CLARENSO) $(CLARENSDO) $(ORDER_) $(MAINLIBS) $(CLARENSLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libClarens.$(SOEXT) $@ \
 		   "$(CLARENSO) $(CLARENSDO) $(CLARENSLIBS)" \

dcache/Module.mk

@@ -35,7 +35,7 @@ INCLUDEFILES += $(DCACHEDEP)
 include/%.h:    $(DCACHEDIRI)/%.h
 	cp $< $@
 
-$(DCACHELIB):   $(DCACHEO) $(DCACHEDO) $(MAINLIBS)
+$(DCACHELIB):   $(DCACHEO) $(DCACHEDO) $(ORDER_) $(MAINLIBS)
 	@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 	"$(SOFLAGS)" libDCache.$(SOEXT) $@ "$(DCACHEO) $(DCACHEDO)" \
 	"$(DCACHELIBEXTRA) $(DCAPLIBDIR) $(DCAPLIB)"

eg/Module.mk

@@ -37,7 +37,7 @@ INCLUDEFILES += $(EGDEP)
 include/%.h:    $(EGDIRI)/%.h
 		cp $< $@
 
-$(EGLIB):       $(EGO) $(EGDO) $(MAINLIBS) $(EGLIBDEP)
+$(EGLIB):       $(EGO) $(EGDO) $(ORDER_) $(MAINLIBS) $(EGLIBDEP)
 ifeq ($(PLATFORM),macosx)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libEG.$(SOEXT) $@ "$(EGO) $(EGDO)" \

foam/Module.mk

@@ -36,7 +36,7 @@ INCLUDEFILES += $(FOAMDEP)
 include/%.h:    $(FOAMDIRI)/%.h
 		cp $< $@
 
-$(FOAMLIB):     $(FOAMO) $(FOAMDO) $(MAINLIBS) $(FOAMLIBDEP)
+$(FOAMLIB):     $(FOAMO) $(FOAMDO) $(ORDER_) $(MAINLIBS) $(FOAMLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libFoam.$(SOEXT) $@ "$(FOAMO) $(FOAMDO)" \
 		   "$(FOAMLIBEXTRA)"

fumili/Module.mk

@@ -36,7 +36,7 @@ INCLUDEFILES += $(FUMILIDEP)
 include/%.h:    $(FUMILIDIRI)/%.h
 		cp $< $@
 
-$(FUMILILIB):   $(FUMILIO) $(FUMILIDO) $(MAINLIBS) $(FUMILILIBDEP)
+$(FUMILILIB):   $(FUMILIO) $(FUMILIDO) $(ORDER_) $(MAINLIBS) $(FUMILILIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libFumili.$(SOEXT) $@ "$(FUMILIO) $(FUMILIDO)" \
 		   "$(FUMILILIBEXTRA)"

g3d/Module.mk

@@ -41,7 +41,7 @@ INCLUDEFILES += $(G3DDEP)
 include/%.h:    $(G3DDIRI)/%.h
 		cp $< $@
 
-$(G3DLIB):      $(G3DO) $(G3DDO) $(MAINLIBS) $(G3DLIBDEP)
+$(G3DLIB):      $(G3DO) $(G3DDO) $(ORDER_) $(MAINLIBS) $(G3DLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libGraf3d.$(SOEXT) $@ "$(G3DO) $(G3DDO)" \
 		   "$(G3DLIBEXTRA)"

ged/Module.mk

@@ -36,7 +36,7 @@ INCLUDEFILES += $(GEDDEP)
 include/%.h:    $(GEDDIRI)/%.h
 		cp $< $@
 
-$(GEDLIB):      $(GEDO) $(GEDDO) $(MAINLIBS) $(GEDLIBDEP)
+$(GEDLIB):      $(GEDO) $(GEDDO) $(ORDER_) $(MAINLIBS) $(GEDLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libGed.$(SOEXT) $@ "$(GEDO) $(GEDDO)" \
 		   "$(GEDLIBEXTRA)"

gedold/Module.mk

@@ -36,7 +36,7 @@ INCLUDEFILES += $(GEDOLDDEP)
 include/%.h:    $(GEDOLDDIRI)/%.h
 		cp $< $@
 
-$(GEDOLDLIB):   $(GEDOLDO) $(GEDOLDDO) $(MAINLIBS) $(GEDOLDLIBDEP)
+$(GEDOLDLIB):   $(GEDOLDO) $(GEDOLDDO) $(ORDER_) $(MAINLIBS) $(GEDOLDLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libGedOld.$(SOEXT) $@ "$(GEDOLDO) $(GEDOLDDO)" \
 		   "$(GEDOLDLIBEXTRA)"

geom/Module.mk

@@ -55,7 +55,7 @@ INCLUDEFILES += $(GEOMDEP)
 include/%.h:    $(GEOMDIRI)/%.h
 		cp $< $@
 
-$(GEOMLIB):     $(GEOMO) $(GEOMDO) $(MAINLIBS) $(GEOMLIBDEP)
+$(GEOMLIB):     $(GEOMO) $(GEOMDO) $(ORDER_) $(MAINLIBS) $(GEOMLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libGeom.$(SOEXT) $@ "$(GEOMO) $(GEOMDO)" \
 		   "$(GEOMLIBEXTRA)"

geompainter/Module.mk

@@ -37,7 +37,7 @@ INCLUDEFILES += $(GEOMPAINTERDEP)
 include/%.h:    $(GEOMPAINTERDIRI)/%.h
 		cp $< $@
 
-$(GEOMPAINTERLIB): $(GEOMPAINTERO) $(GEOMPAINTERDO) $(MAINLIBS) \
+$(GEOMPAINTERLIB): $(GEOMPAINTERO) $(GEOMPAINTERDO) $(ORDER_) $(MAINLIBS) \
                    $(GEOMPAINTERLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libGeomPainter.$(SOEXT) $@ \

gl/Module.mk

@@ -60,7 +60,7 @@ INCLUDEFILES += $(GLDEP)
 include/%.h:    $(GLDIRI)/%.h
 		cp $< $@
 
-$(GLLIB):       $(GLO) $(GLO1) $(GLDO) $(MAINLIBS) $(GLLIBDEP)
+$(GLLIB):       $(GLO) $(GLO1) $(GLDO) $(ORDER_) $(MAINLIBS) $(GLLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
 		   "$(GLLIBEXTRA) $(GLLIBS)"

globusauth/Module.mk

@@ -42,7 +42,7 @@ INCLUDEFILES += $(GLBSAUTHDEP)
 include/%.h:    $(GLBSAUTHDIRI)/%.h
 		cp $< $@
 
-$(GLBSAUTHLIB): $(GLBSAUTHO) $(GLBPATCHO) $(MAINLIBS)
+$(GLBSAUTHLIB): $(GLBSAUTHO) $(GLBPATCHO) $(ORDER_) $(MAINLIBS)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libGlobusAuth.$(SOEXT) $@ \
 		   "$(GLBSAUTHO) $(GLBPATCHO)" \

gpad/Module.mk

@@ -36,7 +36,7 @@ INCLUDEFILES += $(GPADDEP)
 include/%.h:    $(GPADDIRI)/%.h
 		cp $< $@
 
-$(GPADLIB):     $(GPADO) $(GPADDO) $(MAINLIBS) $(GPADLIBDEP)
+$(GPADLIB):     $(GPADO) $(GPADDO) $(ORDER_) $(MAINLIBS) $(GPADLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libGpad.$(SOEXT) $@ "$(GPADO) $(GPADDO)" \
 		   "$(GPADLIBEXTRA)"