From a5b624b2e81b7d0bc6f1aba4350749b55549107c Mon Sep 17 00:00:00 2001 From: Fons Rademakers <Fons.Rademakers@cern.ch> Date: Tue, 22 Jan 2008 13:43:46 +0000 Subject: [PATCH] From Axel: this patch prevents all dictionaries from being rebuild when non dict related changes are made in CINT. When the dictionaries change the new cint/inc/cintdictversion.h must be updated which triggers a dictionary rebuild. For example: touch cint/src/v6_var.cxx && make: rebuild no dictionaries touch cint/inc/cintdictversion.h && make: rebuild all dictionaries touch utils/src/rootcint.cxx && make: rebuild all dictionaries git-svn-id: http://root.cern.ch/svn/root/trunk@21802 27541ba8-7e3a-0410-8455-c3a389f83636 --- Makefile | 3 +++ alien/Module.mk | 2 +- asimage/Module.mk | 4 ++-- auth/Module.mk | 4 ++-- base/Module.mk | 6 +++--- castor/Module.mk | 2 +- chirp/Module.mk | 2 +- cint/cintdlls.mk | 8 ++++---- clarens/Module.mk | 2 +- clib/Module.mk | 2 +- cont/Module.mk | 2 +- dcache/Module.mk | 2 +- eg/Module.mk | 2 +- eve/Module.mk | 2 +- fftw/Module.mk | 2 +- fitpanel/Module.mk | 2 +- foam/Module.mk | 2 +- fumili/Module.mk | 2 +- g3d/Module.mk | 2 +- g4root/Module.mk | 2 +- gdml/Module.mk | 2 +- ged/Module.mk | 2 +- geom/Module.mk | 4 ++-- geombuilder/Module.mk | 2 +- geompainter/Module.mk | 2 +- gfal/Module.mk | 2 +- gl/Module.mk | 2 +- gpad/Module.mk | 2 +- graf/Module.mk | 4 ++-- gui/Module.mk | 6 +++--- guibuilder/Module.mk | 2 +- guihtml/Module.mk | 2 +- hbook/Module.mk | 2 +- hist/Module.mk | 2 +- histpainter/Module.mk | 2 +- html/Module.mk | 2 +- io/Module.mk | 2 +- krb5auth/Module.mk | 2 +- ldap/Module.mk | 2 +- math/Module.mk | 2 +- mathcore/Module.mk | 4 ++-- mathmore/Module.mk | 2 +- matrix/Module.mk | 2 +- meta/Module.mk | 2 +- minuit/Module.mk | 2 +- minuit2/Module.mk | 2 +- mlp/Module.mk | 2 +- monalisa/Module.mk | 2 +- mysql/Module.mk | 2 +- net/Module.mk | 2 +- netx/Module.mk | 2 +- odbc/Module.mk | 2 +- oracle/Module.mk | 2 +- peac/Module.mk | 4 ++-- pgsql/Module.mk | 2 +- physics/Module.mk | 2 +- postscript/Module.mk | 2 +- proof/Module.mk | 2 +- proofplayer/Module.mk | 4 ++-- proofx/Module.mk | 2 +- pyroot/Module.mk | 2 +- pythia6/Module.mk | 2 +- qt/Module.mk | 7 ++++--- qtgsi/Module.mk | 2 +- qtroot/Module.mk | 2 +- quadp/Module.mk | 2 +- reflex/Module.mk | 2 +- rfio/Module.mk | 2 +- rint/Module.mk | 2 +- roofit/Module.mk | 2 +- roofitcore/Module.mk | 6 +++--- ruby/Module.mk | 2 +- sapdb/Module.mk | 2 +- sessionviewer/Module.mk | 2 +- smatrix/Module.mk | 4 ++-- spectrum/Module.mk | 2 +- spectrumpainter/Module.mk | 2 +- splot/Module.mk | 2 +- sql/Module.mk | 2 +- table/Module.mk | 2 +- thread/Module.mk | 4 ++-- tmva/Module.mk | 2 +- tree/Module.mk | 2 +- treeplayer/Module.mk | 2 +- treeviewer/Module.mk | 2 +- unix/Module.mk | 2 +- unuran/Module.mk | 2 +- utils/src/rootcint.cxx | 1 + vmc/Module.mk | 2 +- win32gdk/Module.mk | 2 +- winnt/Module.mk | 2 +- x11/Module.mk | 2 +- x11ttf/Module.mk | 2 +- x3d/Module.mk | 2 +- xml/Module.mk | 2 +- xmlparser/Module.mk | 2 +- 96 files changed, 119 insertions(+), 114 deletions(-) diff --git a/Makefile b/Makefile index eeceab4f84d..93022f47b99 100644 --- a/Makefile +++ b/Makefile @@ -413,6 +413,9 @@ ifneq ($(BUILTINZLIB),yes) CORELIBEXTRA += $(ZLIBCLILIB) endif +##### Dependencies for all dictionaries +ROOTCINTTMPDEP = $(ROOTCINTTMPO) $(ORDER_) $(ROOTCINTTMPEXE) + ##### In case shared libs need to resolve all symbols (e.g.: aix, win32) ##### ifeq ($(EXPLICITLINK),yes) diff --git a/alien/Module.mk b/alien/Module.mk index 7c318c60487..480abc52f5c 100644 --- a/alien/Module.mk +++ b/alien/Module.mk @@ -43,7 +43,7 @@ $(ALIENLIB): $(ALIENO) $(ALIENDO) $(ORDER_) $(MAINLIBS) $(ALIENLIBDEP) "$(SOFLAGS)" libRAliEn.$(SOEXT) $@ "$(ALIENO) $(ALIENDO)" \ "$(ALIENLIBEXTRA) $(ALIENLIBDIR) $(ALIENCLILIB)" -$(ALIENDS): $(ALIENH) $(ALIENL) $(ROOTCINTTMPEXE) +$(ALIENDS): $(ALIENH) $(ALIENL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(ALIENH) $(ALIENL) diff --git a/asimage/Module.mk b/asimage/Module.mk index ab737759d93..80707458ded 100644 --- a/asimage/Module.mk +++ b/asimage/Module.mk @@ -193,7 +193,7 @@ $(ASIMAGELIB): $(ASIMAGEO) $(ASIMAGEDO) $(ASTEPDEP) $(FREETYPEDEP) \ $(FREETYPELDFLAGS) $(FREETYPELIB) \ $(ASEXTRALIBDIR) $(ASEXTRALIB) $(XLIBS)" -$(ASIMAGEDS): $(ASIMAGEH) $(ASIMAGEL) $(ROOTCINTTMPEXE) +$(ASIMAGEDS): $(ASIMAGEH) $(ASIMAGEL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(ASIMAGEH) $(ASIMAGEL) @@ -211,7 +211,7 @@ $(ASIMAGEGUILIB): $(ASIMAGEGUIO) $(ASIMAGEGUIDO) $(ASTEPDEP) $(FREETYPEDEP) \ $(FREETYPELDFLAGS) $(FREETYPELIB) \ $(ASEXTRALIBDIR) $(ASEXTRALIB) $(XLIBS)" -$(ASIMAGEGUIDS): $(ASIMAGEGUIH) $(ASIMAGEGUIL) $(ROOTCINTTMPEXE) +$(ASIMAGEGUIDS): $(ASIMAGEGUIH) $(ASIMAGEGUIL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(ASIMAGEGUIH) $(ASIMAGEGUIL) diff --git a/auth/Module.mk b/auth/Module.mk index f466172b42a..528e06ede77 100644 --- a/auth/Module.mk +++ b/auth/Module.mk @@ -99,7 +99,7 @@ $(RAUTHLIB): $(RAUTHO) $(RAUTHDO) $(ORDER_) $(MAINLIBS) $(RAUTHLIBDEP) "$(SOFLAGS)" libRootAuth.$(SOEXT) $@ "$(RAUTHO) $(RAUTHDO)" \ "$(RAUTHLIBEXTRA) $(EXTRA_RAUTHLIBS)" -$(RAUTHDS): $(RAUTHH) $(RAUTHL) $(ROOTCINTTMPEXE) +$(RAUTHDS): $(RAUTHH) $(RAUTHL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(RAUTHH) $(RAUTHL) @@ -113,7 +113,7 @@ $(AFSAUTHLIB): $(AFSAUTHO) $(AFSAUTHDO) $(ORDER_) $(MAINLIBS) $(AFSAUTHLIBDEP) "$(AFSAUTHO) $(AFSAUTHDO)" \ "$(AFSLIBDIR) $(AFSLIB) $(RESOLVLIB)" -$(AFSAUTHDS): $(AFSAUTHH) $(AFSAUTHL) $(ROOTCINTTMPEXE) +$(AFSAUTHDS): $(AFSAUTHH) $(AFSAUTHL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(AFSAUTHH) $(AFSAUTHL) diff --git a/base/Module.mk b/base/Module.mk index 787f6a70db4..30dc70237e2 100644 --- a/base/Module.mk +++ b/base/Module.mk @@ -71,13 +71,13 @@ include/%.h: $(BASEDIRI)/%.h # rmkdepend does not pick it up if $(COMPILEDATA) doesn't exist yet. base/src/TSystem.d base/src/TSystem.o: $(COMPILEDATA) -$(BASEDS1): $(BASEH1) $(BASEL1) $(ROOTCINTTMPEXE) +$(BASEDS1): $(BASEH1) $(BASEL1) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(BASEH1) $(BASEL1) -$(BASEDS2): $(BASEH1) $(BASEL2) $(ROOTCINTTMPEXE) +$(BASEDS2): $(BASEH1) $(BASEL2) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(BASEH1) $(BASEL2) -$(BASEDS3): $(BASEH3) $(BASEL3) $(ROOTCINTTMPEXE) +$(BASEDS3): $(BASEH3) $(BASEL3) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(BASEH3) $(BASEL3) # pre-requisites intentionally not specified... should be called only diff --git a/castor/Module.mk b/castor/Module.mk index 3eba0b0d937..3f7942f12ae 100644 --- a/castor/Module.mk +++ b/castor/Module.mk @@ -44,7 +44,7 @@ $(CASTORLIB): $(CASTORO) $(CASTORDO) $(ORDER_) $(MAINLIBS) $(CASTORLIBDEP) "$(CASTORO) $(CASTORDO)" \ "$(CASTORLIBEXTRA) $(CASTORLIBDIR) $(CASTORCLILIB)" -$(CASTORDS): $(CASTORH) $(CASTORL) $(ROOTCINTTMPEXE) +$(CASTORDS): $(CASTORH) $(CASTORL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(CASTORH) $(CASTORL) diff --git a/chirp/Module.mk b/chirp/Module.mk index 2b2ede64353..e284f5b1c5b 100644 --- a/chirp/Module.mk +++ b/chirp/Module.mk @@ -42,7 +42,7 @@ $(CHIRPLIB): $(CHIRPO) $(CHIRPDO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libChirp.$(SOEXT) $@ "$(CHIRPO) $(CHIRPDO)" \ "$(CHIRPLIBEXTRA) $(CHIRPLIBDIR) $(CHIRPCLILIB)" -$(CHIRPDS): $(CHIRPH) $(CHIRPL) $(ROOTCINTTMPEXE) +$(CHIRPDS): $(CHIRPH) $(CHIRPL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(CHIRPH) $(CHIRPL) diff --git a/cint/cintdlls.mk b/cint/cintdlls.mk index 4cddfeb7886..5d10ca5a8b2 100644 --- a/cint/cintdlls.mk +++ b/cint/cintdlls.mk @@ -144,17 +144,17 @@ metautils/src/stlLoader_%.o: metautils/src/stlLoader_%.cc $(MAKEDEP) -R -f$(patsubst %.o,%.d,$@) -Y -w 1000 -- $(CINTCXXFLAGS) -D__cplusplus -- $< $(CXX) $(OPT) $(CINTCXXFLAGS) $(INCDIRS) -DWHAT=\"$*\" $(CXXOUT)$@ -c $< -$(CINTDIRDLLSTL)/G__cpp_%.cxx: $(CINTTMP) $(IOSENUM) +$(CINTDIRDLLSTL)/G__cpp_%.cxx: $(ORDER_) $(CINTTMP) $(IOSENUM) $(CINTTMP) -w1 -z$(notdir $*) -n$@ $(subst $*,,$(patsubst %map2,-DG__MAP2,$*)) \ -D__MAKECINT__ -DG__MAKECINT -I$(CINTDIRDLLSTL) -I$(CINTDIRL) \ -c-1 -A -Z0 $(filter-out $(IOSENUM),$(filter %.h,$^)) -$(CINTDIRDLLINC)/G__cpp_%.cxx: $(CINTTMP) $(IOSENUM) +$(CINTDIRDLLINC)/G__cpp_%.cxx: $(ORDER_) $(CINTTMP) $(IOSENUM) $(CINTTMP) -w1 -z$(notdir $*) -n$@ $(subst $*,,$(patsubst %map2,-DG__MAP2,$*)) \ -D__MAKECINT__ -DG__MAKECINT -I$(CINTDIRDLLSTL) -I$(CINTDIRL) \ -c-1 -A -Z0 $(filter-out $(IOSENUM),$(filter %.h,$^)) -$(CINTDIRL)/G__c_%.c: $(CINTTMP) $(IOSENUM) +$(CINTDIRL)/G__c_%.c: $(ORDER_) $(CINTTMP) $(IOSENUM) $(CINTTMP) -K -w1 -z$(notdir $*) -n$@ -D__MAKECINT__ -DG__MAKECINT \ $(MACOSX_UNIX03) -c-2 -Z0 $(filter-out $(IOSENUM),$(filter %.h,$^)) @@ -190,7 +190,7 @@ $(CINTDIRDLLS)/sys/ipc.dll: $(CINTDIRL)/G__c_ipc.o ##### ipc special treatment - END ##### dictionaries -$(CINTDIRDLLSTL)/rootcint_%.cxx: $(ROOTCINTTMPEXE) +$(CINTDIRDLLSTL)/rootcint_%.cxx: $(ROOTCINTTMPDEP) $(ROOTCINTTMP) -f $@ -c \ $(subst $*,,$(patsubst %map2,-DG__MAP2,$*)) $(subst multi,,${*:2=}) \ metautils/src/${*:2=}Linkdef.h diff --git a/clarens/Module.mk b/clarens/Module.mk index f5e29329c1d..95cada9901c 100644 --- a/clarens/Module.mk +++ b/clarens/Module.mk @@ -44,7 +44,7 @@ $(CLARENSLIB): $(CLARENSO) $(CLARENSDO) $(ORDER_) $(MAINLIBS) $(CLARENSLIBDEP) "$(CLARENSO) $(CLARENSDO) $(CLARENSLIBS)" \ "$(CLARENSLIBEXTRA)" -$(CLARENSDS): $(CLARENSH) $(CLARENSL) $(ROOTCINTTMPEXE) +$(CLARENSDS): $(CLARENSH) $(CLARENSL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(CLARENSH) $(CLARENSL) diff --git a/clib/Module.mk b/clib/Module.mk index df39d3181af..f9a63eb2b39 100644 --- a/clib/Module.mk +++ b/clib/Module.mk @@ -35,7 +35,7 @@ INCLUDEFILES += $(CLIBDEP) include/%.h: $(CLIBDIRI)/%.h cp $< $@ -$(CLIBDS): $(CLIBDIRI)/Getline.h $(CLIBL) $(ROOTCINTTMPEXE) +$(CLIBDS): $(CLIBDIRI)/Getline.h $(CLIBL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(CLIBDIRI)/Getline.h $(CLIBL) diff --git a/cont/Module.mk b/cont/Module.mk index ce4b391bc73..93c07b88bad 100644 --- a/cont/Module.mk +++ b/cont/Module.mk @@ -33,7 +33,7 @@ INCLUDEFILES += $(CONTDEP) include/%.h: $(CONTDIRI)/%.h cp $< $@ -$(CONTDS): $(CONTH) $(CONTL) $(ROOTCINTTMPEXE) +$(CONTDS): $(CONTH) $(CONTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(CONTH) $(CONTL) diff --git a/dcache/Module.mk b/dcache/Module.mk index ad4de2462c2..d2c57922a5a 100644 --- a/dcache/Module.mk +++ b/dcache/Module.mk @@ -42,7 +42,7 @@ $(DCACHELIB): $(DCACHEO) $(DCACHEDO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libDCache.$(SOEXT) $@ "$(DCACHEO) $(DCACHEDO)" \ "$(DCACHELIBEXTRA) $(DCAPLIBDIR) $(DCAPLIB)" -$(DCACHEDS): $(DCACHEH) $(DCACHEL) $(ROOTCINTTMPEXE) +$(DCACHEDS): $(DCACHEH) $(DCACHEL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(DCACHEH) $(DCACHEL) diff --git a/eg/Module.mk b/eg/Module.mk index 0a1ca002f41..98788334363 100644 --- a/eg/Module.mk +++ b/eg/Module.mk @@ -44,7 +44,7 @@ $(EGLIB): $(EGO) $(EGDO) $(ORDER_) $(MAINLIBS) $(EGLIBDEP) "$(SOFLAGS)" libEG.$(SOEXT) $@ "$(EGO) $(EGDO)" \ "$(EGLIBEXTRA)" -$(EGDS): $(EGH1) $(EGL) $(ROOTCINTTMPEXE) +$(EGDS): $(EGH1) $(EGL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(EGH1) $(EGL) diff --git a/eve/Module.mk b/eve/Module.mk index d6e1a785e47..839766bf094 100644 --- a/eve/Module.mk +++ b/eve/Module.mk @@ -43,7 +43,7 @@ $(EVELIB): $(EVEO) $(EVEDO) $(ORDER_) $(MAINLIBS) $(EVELIBDEP) "$(SOFLAGS)" libEve.$(SOEXT) $@ "$(EVEO) $(EVEDO)" \ "$(EVELIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) $(GLLIBS)" -$(EVEDS): $(EVEH) $(EVEL) $(ROOTCINTTMPEXE) +$(EVEDS): $(EVEH) $(EVEL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(EVEH) $(EVEDIRS)/SolarisCCDictHack.h $(EVEL) diff --git a/fftw/Module.mk b/fftw/Module.mk index db67a07ad55..6fff3db7f8e 100644 --- a/fftw/Module.mk +++ b/fftw/Module.mk @@ -43,7 +43,7 @@ $(FFTWLIB): $(FFTWO) $(FFTWDO) $(ORDER_) $(MAINLIBS) $(FFTWLIBDEP) "$(SOFLAGS)" libFFTW.$(SOEXT) $@ "$(FFTWO) $(FFTWDO)" \ "$(FFTWLIBEXTRA) $(FFTW3LIBDIR) $(FFTW3LIB)" -$(FFTWDS): $(FFTWH) $(FFTWL) $(ROOTCINTTMPEXE) +$(FFTWDS): $(FFTWH) $(FFTWL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(FFTWH) $(FFTWL) diff --git a/fitpanel/Module.mk b/fitpanel/Module.mk index 3ac1fb6f007..807d4a557a6 100644 --- a/fitpanel/Module.mk +++ b/fitpanel/Module.mk @@ -43,7 +43,7 @@ $(FITPANELLIB): $(FITPANELO) $(FITPANELDO) $(ORDER_) $(MAINLIBS) $(FITPANELLIBDE "$(SOFLAGS)" libFitPanel.$(SOEXT) $@ "$(FITPANELO) $(FITPANELDO)" \ "$(FITPANELLIBEXTRA)" -$(FITPANELDS): $(FITPANELH) $(FITPANELL) $(ROOTCINTTMPEXE) +$(FITPANELDS): $(FITPANELH) $(FITPANELL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(FITPANELH) $(FITPANELL) diff --git a/foam/Module.mk b/foam/Module.mk index ac2cc7fa725..1337f27a696 100644 --- a/foam/Module.mk +++ b/foam/Module.mk @@ -43,7 +43,7 @@ $(FOAMLIB): $(FOAMO) $(FOAMDO) $(ORDER_) $(MAINLIBS) $(FOAMLIBDEP) "$(SOFLAGS)" libFoam.$(SOEXT) $@ "$(FOAMO) $(FOAMDO)" \ "$(FOAMLIBEXTRA)" -$(FOAMDS): $(FOAMH) $(FOAML) $(ROOTCINTTMPEXE) +$(FOAMDS): $(FOAMH) $(FOAML) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(FOAMH) $(FOAML) diff --git a/fumili/Module.mk b/fumili/Module.mk index e5d5196782f..728d0038478 100644 --- a/fumili/Module.mk +++ b/fumili/Module.mk @@ -43,7 +43,7 @@ $(FUMILILIB): $(FUMILIO) $(FUMILIDO) $(ORDER_) $(MAINLIBS) $(FUMILILIBDEP) "$(SOFLAGS)" libFumili.$(SOEXT) $@ "$(FUMILIO) $(FUMILIDO)" \ "$(FUMILILIBEXTRA)" -$(FUMILIDS): $(FUMILIH) $(FUMILIL) $(ROOTCINTTMPEXE) +$(FUMILIDS): $(FUMILIH) $(FUMILIL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(FUMILIH) $(FUMILIL) diff --git a/g3d/Module.mk b/g3d/Module.mk index bf2593d1241..62db703863b 100644 --- a/g3d/Module.mk +++ b/g3d/Module.mk @@ -48,7 +48,7 @@ $(G3DLIB): $(G3DO) $(G3DDO) $(ORDER_) $(MAINLIBS) $(G3DLIBDEP) "$(SOFLAGS)" libGraf3d.$(SOEXT) $@ "$(G3DO) $(G3DDO)" \ "$(G3DLIBEXTRA)" -$(G3DDS): $(G3DH1) $(G3DL) $(ROOTCINTTMPEXE) +$(G3DDS): $(G3DH1) $(G3DL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(G3DH1) $(G3DL) diff --git a/g4root/Module.mk b/g4root/Module.mk index df72ff20499..0f7b72bcd48 100644 --- a/g4root/Module.mk +++ b/g4root/Module.mk @@ -53,7 +53,7 @@ $(G4ROOTLIB): $(G4ROOTO) $(G4ROOTDO) $(ORDER_) $(MAINLIBS) $(G4ROOTLIBDEP) "$(SOFLAGS)" libG4root.$(SOEXT) $@ "$(G4ROOTO) $(G4ROOTDO)" \ "$(G4ROOTLIBEXTRA)" -$(G4ROOTDS1): $(G4ROOTH1) $(G4ROOTL1) $(ROOTCINTTMPEXE) +$(G4ROOTDS1): $(G4ROOTH1) $(G4ROOTL1) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(CXXFLAGS) -I$(G4ROOTINCDIR) \ $(G4ROOTH2) $(G4ROOTL1) diff --git a/gdml/Module.mk b/gdml/Module.mk index c1cd7c92f85..2db926b92a6 100644 --- a/gdml/Module.mk +++ b/gdml/Module.mk @@ -43,7 +43,7 @@ $(GDMLLIB): $(GDMLO) $(GDMLDO) $(ORDER_) $(MAINLIBS) $(GDMLLIBDEP) "$(SOFLAGS)" libGdml.$(SOEXT) $@ "$(GDMLO) $(GDMLDO)" \ "$(GDMLLIBEXTRA)" -$(GDMLDS): $(GDMLH) $(GDMLL) $(ROOTCINTTMPEXE) +$(GDMLDS): $(GDMLH) $(GDMLL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GDMLH) $(GDMLL) diff --git a/ged/Module.mk b/ged/Module.mk index 6023ba631d3..c8c2afaedb9 100644 --- a/ged/Module.mk +++ b/ged/Module.mk @@ -43,7 +43,7 @@ $(GEDLIB): $(GEDO) $(GEDDO) $(ORDER_) $(MAINLIBS) $(GEDLIBDEP) "$(SOFLAGS)" libGed.$(SOEXT) $@ "$(GEDO) $(GEDDO)" \ "$(GEDLIBEXTRA)" -$(GEDDS): $(GEDH) $(GEDL) $(ROOTCINTTMPEXE) +$(GEDDS): $(GEDH) $(GEDL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GEDH) $(GEDL) diff --git a/geom/Module.mk b/geom/Module.mk index fbd15cd9bfb..92ed9088ef2 100644 --- a/geom/Module.mk +++ b/geom/Module.mk @@ -63,11 +63,11 @@ $(GEOMLIB): $(GEOMO) $(GEOMDO) $(ORDER_) $(MAINLIBS) $(GEOMLIBDEP) "$(SOFLAGS)" libGeom.$(SOEXT) $@ "$(GEOMO) $(GEOMDO)" \ "$(GEOMLIBEXTRA)" -$(GEOMDS1): $(GEOMH1) $(GEOML1) $(ROOTCINTTMPEXE) +$(GEOMDS1): $(GEOMH1) $(GEOML1) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GEOMH1) $(GEOML1) -$(GEOMDS2): $(GEOMH2) $(GEOML2) $(ROOTCINTTMPEXE) +$(GEOMDS2): $(GEOMH2) $(GEOML2) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GEOMH2) $(GEOML2) diff --git a/geombuilder/Module.mk b/geombuilder/Module.mk index d5b6015e28f..675eb01c3b8 100644 --- a/geombuilder/Module.mk +++ b/geombuilder/Module.mk @@ -52,7 +52,7 @@ $(GEOMBUILDERLIB): $(GEOMBUILDERO) $(GEOMBUILDERDO) $(ORDER_) $(MAINLIBS) \ "$(GEOMBUILDERO) $(GEOMBUILDERDO)" \ "$(GEOMBUILDERLIBEXTRA)" -$(GEOMBUILDERDS): $(GEOMBUILDERH) $(GEOMBUILDERL) $(ROOTCINTTMPEXE) +$(GEOMBUILDERDS): $(GEOMBUILDERH) $(GEOMBUILDERL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GEOMBUILDERH) $(GEOMBUILDERL) diff --git a/geompainter/Module.mk b/geompainter/Module.mk index bc46de9b023..9a12dbcd532 100644 --- a/geompainter/Module.mk +++ b/geompainter/Module.mk @@ -46,7 +46,7 @@ $(GEOMPAINTERLIB): $(GEOMPAINTERO) $(GEOMPAINTERDO) $(ORDER_) $(MAINLIBS) \ "$(GEOMPAINTERO) $(GEOMPAINTERDO)" \ "$(GEOMPAINTERLIBEXTRA)" -$(GEOMPAINTERDS): $(GEOMPAINTERH1) $(GEOMPAINTERL) $(ROOTCINTTMPEXE) +$(GEOMPAINTERDS): $(GEOMPAINTERH1) $(GEOMPAINTERL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GEOMPAINTERH1) $(GEOMPAINTERL) diff --git a/gfal/Module.mk b/gfal/Module.mk index 5e82ec8ff79..f922318cd94 100644 --- a/gfal/Module.mk +++ b/gfal/Module.mk @@ -43,7 +43,7 @@ $(GFALLIB): $(GFALO) $(GFALDO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libGFAL.$(SOEXT) $@ "$(GFALO) $(GFALDO)" \ "$(GFALLIBEXTRA) $(GFALLIBDIR) $(GFALCLILIB)" -$(GFALDS): $(GFALH) $(GFALL) $(ROOTCINTTMPEXE) +$(GFALDS): $(GFALH) $(GFALL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GFALH) $(GFALL) diff --git a/gl/Module.mk b/gl/Module.mk index ef38787a2a2..3f5d9694b4b 100644 --- a/gl/Module.mk +++ b/gl/Module.mk @@ -68,7 +68,7 @@ $(GLLIB): $(GLO) $(GLO1) $(GLDO) $(ORDER_) $(MAINLIBS) $(GLLIBDEP) "$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \ "$(GLLIBEXTRA) $(FTGLLIBDIR) $(FTGLLIBS) $(GLLIBS)" -$(GLDS): $(GLH2) $(GLL) $(ROOTCINTTMPEXE) +$(GLDS): $(GLH2) $(GLL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GLH2) $(GLL) diff --git a/gpad/Module.mk b/gpad/Module.mk index 739be831b77..6ce83880210 100644 --- a/gpad/Module.mk +++ b/gpad/Module.mk @@ -43,7 +43,7 @@ $(GPADLIB): $(GPADO) $(GPADDO) $(ORDER_) $(MAINLIBS) $(GPADLIBDEP) "$(SOFLAGS)" libGpad.$(SOEXT) $@ "$(GPADO) $(GPADDO)" \ "$(GPADLIBEXTRA)" -$(GPADDS): $(GPADH) $(GPADL) $(ROOTCINTTMPEXE) +$(GPADDS): $(GPADH) $(GPADL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GPADH) $(GPADL) diff --git a/graf/Module.mk b/graf/Module.mk index 116170fe64b..ad30ad93dd9 100644 --- a/graf/Module.mk +++ b/graf/Module.mk @@ -52,10 +52,10 @@ $(GRAFLIB): $(GRAFO) $(GRAFDO) $(FREETYPEDEP) $(ORDER_) $(MAINLIBS) $(GRAFLI "$(GRAFO) $(GRAFDO)" \ "$(FREETYPELDFLAGS) $(FREETYPELIB) $(GRAFLIBEXTRA)" -$(GRAFDS1): $(GRAFHD) $(GRAFL1) $(ROOTCINTTMPEXE) +$(GRAFDS1): $(GRAFHD) $(GRAFL1) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GRAFHD) $(GRAFL1) -$(GRAFDS2): $(GRAFH) $(GRAFL2) $(ROOTCINTTMPEXE) +$(GRAFDS2): $(GRAFH) $(GRAFL2) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(FREETYPEINC) $(GRAFH) $(GRAFL2) diff --git a/gui/Module.mk b/gui/Module.mk index a72c40eaed7..97a1e47ca22 100644 --- a/gui/Module.mk +++ b/gui/Module.mk @@ -80,13 +80,13 @@ $(GUILIB): $(GUIO) $(GUIDO) $(ORDER_) $(MAINLIBS) $(GUILIBDEP) "$(SOFLAGS)" libGui.$(SOEXT) $@ "$(GUIO) $(GUIDO)" \ "$(GUILIBEXTRA)" -$(GUIDS1): $(GUIH1) $(GUIL1) $(ROOTCINTTMPEXE) +$(GUIDS1): $(GUIH1) $(GUIL1) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GUIH1) $(GUIL1) -$(GUIDS2): $(GUIH2) $(GUIL2) $(ROOTCINTTMPEXE) +$(GUIDS2): $(GUIH2) $(GUIL2) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GUIH2) $(GUIL2) -$(GUIDS3): $(GUIH3) $(GUIL3) $(ROOTCINTTMPEXE) +$(GUIDS3): $(GUIH3) $(GUIL3) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GUIH3) $(GUIL3) diff --git a/guibuilder/Module.mk b/guibuilder/Module.mk index 4be21d0dc14..7427c8a4ce8 100644 --- a/guibuilder/Module.mk +++ b/guibuilder/Module.mk @@ -43,7 +43,7 @@ $(GUIBLDLIB): $(GUIBLDO) $(GUIBLDDO) $(ORDER_) $(MAINLIBS) $(GUIBLDLIBDEP) "$(SOFLAGS)" libGuiBld.$(SOEXT) $@ "$(GUIBLDO) $(GUIBLDDO)" \ "$(GUIBLDLIBEXTRA)" -$(GUIBLDDS): $(GUIBLDH) $(GUIBLDL) $(ROOTCINTTMPEXE) +$(GUIBLDDS): $(GUIBLDH) $(GUIBLDL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GUIBLDH) $(GUIBLDL) diff --git a/guihtml/Module.mk b/guihtml/Module.mk index 327a0f1fd5a..e29bf0fc068 100644 --- a/guihtml/Module.mk +++ b/guihtml/Module.mk @@ -43,7 +43,7 @@ $(GUIHTMLLIB): $(GUIHTMLO) $(GUIHTMLDO) $(ORDER_) $(MAINLIBS) $(GUIHTMLLIBDEP) "$(SOFLAGS)" libGuiHtml.$(SOEXT) $@ "$(GUIHTMLO) $(GUIHTMLDO)" \ "$(GUIHTMLLIBEXTRA)" -$(GUIHTMLDS): $(GUIHTMLH) $(GUIHTMLL) $(ROOTCINTTMPEXE) +$(GUIHTMLDS): $(GUIHTMLH) $(GUIHTMLL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GUIHTMLH) $(GUIHTMLL) diff --git a/hbook/Module.mk b/hbook/Module.mk index 559182b44f0..889edb89f0e 100644 --- a/hbook/Module.mk +++ b/hbook/Module.mk @@ -47,7 +47,7 @@ $(HBOOKLIB): $(HBOOKO) $(HBOOKDO) $(ORDER_) $(MAINLIBS) $(HBOOKLIBDEP) "$(HBOOKO2) $(CERNLIBDIR) $(CERNLIBS) \ $(SHIFTLIBDIR) $(SHIFTLIB) $(HBOOKLIBEXTRA) $(F77LIBS)" -$(HBOOKDS): $(HBOOKH) $(HBOOKL) $(ROOTCINTTMPEXE) +$(HBOOKDS): $(HBOOKH) $(HBOOKL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(HBOOKH) $(HBOOKL) diff --git a/hist/Module.mk b/hist/Module.mk index 8771f83fa60..f501bba3968 100644 --- a/hist/Module.mk +++ b/hist/Module.mk @@ -43,7 +43,7 @@ $(HISTLIB): $(HISTO) $(HISTDO) $(ORDER_) $(MAINLIBS) $(HISTLIBDEP) "$(SOFLAGS)" libHist.$(SOEXT) $@ "$(HISTO) $(HISTDO)" \ "$(HISTLIBEXTRA)" -$(HISTDS): $(HISTH) $(HISTL) $(ROOTCINTTMPEXE) +$(HISTDS): $(HISTH) $(HISTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(HISTH) $(HISTL) diff --git a/histpainter/Module.mk b/histpainter/Module.mk index a0ff194c828..c0088bcd482 100644 --- a/histpainter/Module.mk +++ b/histpainter/Module.mk @@ -46,7 +46,7 @@ $(HISTPAINTERLIB): $(HISTPAINTERO) $(HISTPAINTERDO) $(ORDER_) $(MAINLIBS) \ "$(HISTPAINTERO) $(HISTPAINTERDO)" \ "$(HISTPAINTERLIBEXTRA)" -$(HISTPAINTERDS): $(HISTPAINTERH1) $(HISTPAINTERL) $(ROOTCINTTMPEXE) +$(HISTPAINTERDS): $(HISTPAINTERH1) $(HISTPAINTERL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(HISTPAINTERH1) $(HISTPAINTERL) diff --git a/html/Module.mk b/html/Module.mk index bb5cc59a032..ae189990bcd 100644 --- a/html/Module.mk +++ b/html/Module.mk @@ -43,7 +43,7 @@ $(HTMLLIB): $(HTMLO) $(HTMLDO) $(ORDER_) $(MAINLIBS) $(HTMLLIBDEP) "$(SOFLAGS)" libHtml.$(SOEXT) $@ "$(HTMLO) $(HTMLDO)" \ "$(HTMLLIBEXTRA)" -$(HTMLDS): $(HTMLH) $(HTMLL) $(ROOTCINTTMPEXE) +$(HTMLDS): $(HTMLH) $(HTMLL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(HTMLH) $(HTMLL) diff --git a/io/Module.mk b/io/Module.mk index 41d1db80719..299c607afd6 100644 --- a/io/Module.mk +++ b/io/Module.mk @@ -43,7 +43,7 @@ $(IOLIB): $(IOO) $(IODO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libRIO.$(SOEXT) $@ "$(IOO) $(IODO)" \ "$(IOLIBEXTRA)" -$(IODS): $(IOH) $(IOL) $(ROOTCINTTMPEXE) +$(IODS): $(IOH) $(IOL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(IOH) $(IOL) diff --git a/krb5auth/Module.mk b/krb5auth/Module.mk index d85fd476cfa..5471b3ea19b 100644 --- a/krb5auth/Module.mk +++ b/krb5auth/Module.mk @@ -48,7 +48,7 @@ $(KRB5AUTHLIB): $(KRB5AUTHO) $(KRB5AUTHDO) $(ORDER_) $(MAINLIBS) $(KRB5AUTHLIBDE $(COMERRLIBDIR) $(COMERRLIB) $(RESOLVLIB) \ $(CRYPTOLIBDIR) $(CRYPTOLIB) $(KRB5AUTHLIBEXTRA)" -$(KRB5AUTHDS): $(KRB5AUTHH1) $(KRB5AUTHL) $(ROOTCINTTMPEXE) +$(KRB5AUTHDS): $(KRB5AUTHH1) $(KRB5AUTHL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(KRB5INCDIR:%=-I%) $(KRB5AUTHH1) $(KRB5AUTHL) diff --git a/ldap/Module.mk b/ldap/Module.mk index 76863706ff4..85f24daf598 100644 --- a/ldap/Module.mk +++ b/ldap/Module.mk @@ -43,7 +43,7 @@ $(LDAPLIB): $(LDAPO) $(LDAPDO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libRLDAP.$(SOEXT) $@ "$(LDAPO) $(LDAPDO)" \ "$(LDAPLIBEXTRA) $(LDAPLIBDIR) $(LDAPCLILIB)" -$(LDAPDS): $(LDAPH) $(LDAPL) $(ROOTCINTTMPEXE) +$(LDAPDS): $(LDAPH) $(LDAPL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(LDAPH) $(LDAPL) diff --git a/math/Module.mk b/math/Module.mk index 3357b007ed2..07c40d3c5f3 100644 --- a/math/Module.mk +++ b/math/Module.mk @@ -52,7 +52,7 @@ $(MATHLIB): $(MATHO) $(MATHDO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libRMath.$(SOEXT) $@ "$(MATHO) $(MATHDO)" \ "$(MATHLIBEXTRA)" -$(MATHDS): $(MATHH) $(MATHL) $(ROOTCINTTMPEXE) +$(MATHDS): $(MATHH) $(MATHL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(MATHH) $(MATHL) diff --git a/mathcore/Module.mk b/mathcore/Module.mk index 1951f54339c..eb99854e24e 100644 --- a/mathcore/Module.mk +++ b/mathcore/Module.mk @@ -103,13 +103,13 @@ $(MATHCORELIB): $(MATHCOREO) $(MATHCOREDO) $(MATHCOREDO32) $(ORDER_) $(MAINLIBS) "$(MATHCOREO) $(MATHCOREDO) $(MATHCOREDO32)" \ "$(MATHCORELIBEXTRA)" -$(MATHCOREDS): $(MATHCOREDH1) $(MATHCOREL) $(MATHCORELINC) $(ROOTCINTTMPEXE) +$(MATHCOREDS): $(MATHCOREDH1) $(MATHCOREL) $(MATHCORELINC) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." @echo "for files $(MATHCOREDH1)" $(ROOTCINTTMP) -f $@ -c $(MATHCOREDH1) $(MATHCOREL) # genreflex $(MATHCOREDIRS)/MathCoreDict.h --selection_file=$(MATHCOREDIRS)/selection_MathCore.xml -o $(MATHCOREDIRS)/G__MathCore.cxx -I$(MATHCOREDIRI) -$(MATHCOREDS32):$(MATHCOREDH132) $(MATHCOREL) $(MATHCORELINC) $(ROOTCINTTMPEXE) +$(MATHCOREDS32):$(MATHCOREDH132) $(MATHCOREL) $(MATHCORELINC) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." @echo "for files $(MATHCOREDH132)" $(ROOTCINTTMP) -f $@ -c $(MATHCOREDH132) $(MATHCOREL32) diff --git a/mathmore/Module.mk b/mathmore/Module.mk index bdcb93bb1ef..c49a7a4bb70 100644 --- a/mathmore/Module.mk +++ b/mathmore/Module.mk @@ -77,7 +77,7 @@ $(MATHMORELIB): $(MATHMOREO) $(MATHMOREDO) $(ORDER_) $(MAINLIBS) "$(MATHMOREO) $(MATHMOREDO)" \ "$(MATHMORELIBEXTRA) $(GSLLIBDIR) $(GSLLIBS)" -$(MATHMOREDS): $(MATHMOREDH1) $(MATHMOREL) $(MATHMORELINC) $(ROOTCINTTMPEXE) +$(MATHMOREDS): $(MATHMOREDH1) $(MATHMOREL) $(MATHMORELINC) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(MATHMOREDH1) $(MATHMOREL) diff --git a/matrix/Module.mk b/matrix/Module.mk index 8a47b6b9e80..f4a4e09a951 100644 --- a/matrix/Module.mk +++ b/matrix/Module.mk @@ -43,7 +43,7 @@ $(MATRIXLIB): $(MATRIXO) $(MATRIXDO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libMatrix.$(SOEXT) $@ "$(MATRIXO) $(MATRIXDO)" \ "$(MATRIXLIBEXTRA)" -$(MATRIXDS): $(MATRIXH) $(MATRIXL) $(ROOTCINTTMPEXE) +$(MATRIXDS): $(MATRIXH) $(MATRIXL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(MATRIXH) $(MATRIXL) diff --git a/meta/Module.mk b/meta/Module.mk index 8476d69b1bb..c8f00d67927 100644 --- a/meta/Module.mk +++ b/meta/Module.mk @@ -33,7 +33,7 @@ INCLUDEFILES += $(METADEP) include/%.h: $(METADIRI)/%.h cp $< $@ -$(METADS): $(METAH) $(METAL) $(ROOTCINTTMPEXE) +$(METADS): $(METAH) $(METAL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c -DG__API $(METAH) $(METAL) diff --git a/minuit/Module.mk b/minuit/Module.mk index 408077abc6d..1123a9fc96f 100644 --- a/minuit/Module.mk +++ b/minuit/Module.mk @@ -43,7 +43,7 @@ $(MINUITLIB): $(MINUITO) $(MINUITDO) $(ORDER_) $(MAINLIBS) $(MINUITLIBDEP) "$(SOFLAGS)" libMinuit.$(SOEXT) $@ "$(MINUITO) $(MINUITDO)" \ "$(MINUITLIBEXTRA)" -$(MINUITDS): $(MINUITH) $(MINUITL) $(ROOTCINTTMPEXE) +$(MINUITDS): $(MINUITH) $(MINUITL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(MINUITH) $(MINUITL) diff --git a/minuit2/Module.mk b/minuit2/Module.mk index 41033280be2..4822ecf973f 100644 --- a/minuit2/Module.mk +++ b/minuit2/Module.mk @@ -78,7 +78,7 @@ $(MINUIT2LIB): $(MINUIT2O) $(MINUIT2DO) $(ORDER_) $(MAINLIBS) $(MINUIT2LIBDEP) "$(MINUIT2O) $(MINUIT2DO)" \ "$(MINUIT2LIBEXTRA)" -$(MINUIT2DS): $(MINUIT2H) $(MINUIT2L) $(ROOTCINTTMPEXE) +$(MINUIT2DS): $(MINUIT2H) $(MINUIT2L) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(MINUIT2H) $(MINUIT2L) diff --git a/mlp/Module.mk b/mlp/Module.mk index 471f0393a24..e44921c683c 100644 --- a/mlp/Module.mk +++ b/mlp/Module.mk @@ -43,7 +43,7 @@ $(MLPLIB): $(MLPO) $(MLPDO) $(ORDER_) $(MAINLIBS) $(MLPLIBDEP) "$(SOFLAGS)" libMLP.$(SOEXT) $@ "$(MLPO) $(MLPDO)" \ "$(MLPLIBEXTRA)" -$(MLPDS): $(MLPH) $(MLPL) $(ROOTCINTTMPEXE) +$(MLPDS): $(MLPH) $(MLPL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(MLPH) $(MLPL) diff --git a/monalisa/Module.mk b/monalisa/Module.mk index b1ee950e16f..17c083410c3 100644 --- a/monalisa/Module.mk +++ b/monalisa/Module.mk @@ -44,7 +44,7 @@ $(MONALISALIB): $(MONALISAO) $(MONALISADO) $(ORDER_) $(MAINLIBS) $(MONALISALIBDE "$(MONALISALIBEXTRA) $(MONALISALIBDIR) $(MONALISACLILIB) \ $(MONALISAWSLIBDIR) $(MONALISAWSCLILIB)" -$(MONALISADS): $(MONALISAH) $(MONALISAL) $(ROOTCINTTMPEXE) +$(MONALISADS): $(MONALISAH) $(MONALISAL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(MONALISAH) $(MONALISAL) diff --git a/mysql/Module.mk b/mysql/Module.mk index 90bdc2a9b50..7e3936a3740 100644 --- a/mysql/Module.mk +++ b/mysql/Module.mk @@ -43,7 +43,7 @@ $(MYSQLLIB): $(MYSQLO) $(MYSQLDO) $(ORDER_) $(MAINLIBS) $(MYSQLLIBDEP) "$(SOFLAGS)" libRMySQL.$(SOEXT) $@ "$(MYSQLO) $(MYSQLDO)" \ "$(MYSQLLIBEXTRA) $(MYSQLLIBDIR) $(MYSQLCLILIB)" -$(MYSQLDS): $(MYSQLH) $(MYSQLL) $(ROOTCINTTMPEXE) +$(MYSQLDS): $(MYSQLH) $(MYSQLL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(MYSQLINCDIR:%=-I%) $(MYSQLH) $(MYSQLL) diff --git a/net/Module.mk b/net/Module.mk index 24a979eceea..e30c2bc7fc0 100644 --- a/net/Module.mk +++ b/net/Module.mk @@ -45,7 +45,7 @@ $(NETLIB): $(NETO) $(NETDO) $(ORDER_) $(MAINLIBS) $(NETLIBDEP) "$(SOFLAGS)" libNet.$(SOEXT) $@ "$(NETO) $(NETDO)" \ "$(NETLIBEXTRA)" -$(NETDS): $(NETH) $(NETL) $(ROOTCINTTMPEXE) +$(NETDS): $(NETH) $(NETL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(NETH) $(NETL) diff --git a/netx/Module.mk b/netx/Module.mk index 363e6ff0937..71b50fbe290 100644 --- a/netx/Module.mk +++ b/netx/Module.mk @@ -72,7 +72,7 @@ $(NETXLIB): $(NETXO) $(NETXDO) $(ORDER_) $(MAINLIBS) $(NETXLIBDEP) \ "$(SOFLAGS)" libNetx.$(SOEXT) $@ "$(NETXO) $(NETXDO)" \ "$(NETXLIBEXTRA)" -$(NETXDS): $(NETXH1) $(NETXL) $(ROOTCINTTMPEXE) $(XROOTDETAG) +$(NETXDS): $(NETXH1) $(NETXL) $(XROOTDETAG) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(NETXINCEXTRA) $(NETXH) $(NETXL) diff --git a/odbc/Module.mk b/odbc/Module.mk index 7dcad7eb9bd..aa65b15de1c 100644 --- a/odbc/Module.mk +++ b/odbc/Module.mk @@ -43,7 +43,7 @@ $(ODBCLIB): $(ODBCO) $(ODBCDO) $(ORDER_) $(MAINLIBS) $(ODBCLIBDEP) "$(SOFLAGS)" libRODBC.$(SOEXT) $@ "$(ODBCO) $(ODBCDO)" \ "$(ODBCLIBEXTRA) $(ODBCLIBDIR) $(ODBCCLILIB)" -$(ODBCDS): $(ODBCH) $(ODBCL) $(ROOTCINTTMPEXE) +$(ODBCDS): $(ODBCH) $(ODBCL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(ODBCINCDIR:%=-I%) $(ODBCH) $(ODBCL) diff --git a/oracle/Module.mk b/oracle/Module.mk index d003eb3188d..c5873d85e31 100644 --- a/oracle/Module.mk +++ b/oracle/Module.mk @@ -43,7 +43,7 @@ $(ORACLELIB): $(ORACLEO) $(ORACLEDO) $(ORDER_) $(MAINLIBS) $(ORACLELIBDEP) "$(SOFLAGS)" libOracle.$(SOEXT) $@ "$(ORACLEO) $(ORACLEDO)" \ "$(ORACLELIBEXTRA) $(ORACLELIBDIR) $(ORACLECLILIB)" -$(ORACLEDS): $(ORACLEH) $(ORACLEL) $(ROOTCINTTMPEXE) +$(ORACLEDS): $(ORACLEH) $(ORACLEL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(ORACLEH) $(ORACLEL) diff --git a/peac/Module.mk b/peac/Module.mk index 3adda9176f6..9b877e5324c 100644 --- a/peac/Module.mk +++ b/peac/Module.mk @@ -65,7 +65,7 @@ $(PEACLIB): $(PEACO) $(PEACDO) $(ORDER_) $(MAINLIBS) $(PEACLIBDEP) "$(SOFLAGS)" libPeac.$(SOEXT) $@ "$(PEACO) $(PEACDO)" \ "$(PEACLIBEXTRA)" -$(PEACDS): $(PEACH) $(PEACL) $(ROOTCINTTMPEXE) +$(PEACDS): $(PEACH) $(PEACL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PEACH) $(PEACL) @@ -79,7 +79,7 @@ $(PEACGUILIB): $(PEACGUIO) $(PEACGUIDO) $(ORDER_) $(MAINLIBS) $(PEACGUILIBDEP) "$(PEACGUIO) $(PEACGUIDO)" \ "$(PEACGUILIBEXTRA)" -$(PEACGUIDS): $(PEACGUIH) $(PEACGUIL) $(ROOTCINTTMPEXE) +$(PEACGUIDS): $(PEACGUIH) $(PEACGUIL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PEACGUIH) $(PEACGUIL) diff --git a/pgsql/Module.mk b/pgsql/Module.mk index 3179501290b..02090c10e40 100644 --- a/pgsql/Module.mk +++ b/pgsql/Module.mk @@ -43,7 +43,7 @@ $(PGSQLLIB): $(PGSQLO) $(PGSQLDO) $(ORDER_) $(MAINLIBS) $(PGSQLLIBDEP) "$(SOFLAGS)" libPgSQL.$(SOEXT) $@ "$(PGSQLO) $(PGSQLDO)" \ "$(PGSQLLIBEXTRA) $(PGSQLLIBDIR) $(PGSQLCLILIB)" -$(PGSQLDS): $(PGSQLH) $(PGSQLL) $(ROOTCINTTMPEXE) +$(PGSQLDS): $(PGSQLH) $(PGSQLL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PGSQLH) $(PGSQLL) diff --git a/physics/Module.mk b/physics/Module.mk index 13a30e766e1..2aa31a6923b 100644 --- a/physics/Module.mk +++ b/physics/Module.mk @@ -43,7 +43,7 @@ $(PHYSICSLIB): $(PHYSICSO) $(PHYSICSDO) $(ORDER_) $(MAINLIBS) $(PHYSICSLIBDEP) "$(SOFLAGS)" libPhysics.$(SOEXT) $@ \ "$(PHYSICSO) $(PHYSICSDO)" "$(PHYSICSLIBEXTRA)" -$(PHYSICSDS): $(PHYSICSH) $(PHYSICSL) $(ROOTCINTTMPEXE) +$(PHYSICSDS): $(PHYSICSH) $(PHYSICSL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PHYSICSH) $(PHYSICSL) diff --git a/postscript/Module.mk b/postscript/Module.mk index 3e4d8387309..e88f7a1c96c 100644 --- a/postscript/Module.mk +++ b/postscript/Module.mk @@ -44,7 +44,7 @@ $(POSTSCRIPTLIB): $(POSTSCRIPTO) $(POSTSCRIPTDO) $(ORDER_) $(MAINLIBS) $(POSTSCR "$(POSTSCRIPTO) $(POSTSCRIPTDO)" \ "$(POSTSCRIPTLIBEXTRA)" -$(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPEXE) +$(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(POSTSCRIPTH) $(POSTSCRIPTL) diff --git a/proof/Module.mk b/proof/Module.mk index d5f30fd05e3..5e5b58dabe5 100644 --- a/proof/Module.mk +++ b/proof/Module.mk @@ -43,7 +43,7 @@ $(PROOFLIB): $(PROOFO) $(PROOFDO) $(ORDER_) $(MAINLIBS) $(PROOFLIBDEP) "$(SOFLAGS)" libProof.$(SOEXT) $@ "$(PROOFO) $(PROOFDO)" \ "$(PROOFLIBEXTRA)" -$(PROOFDS): $(PROOFH) $(PROOFL) $(ROOTCINTTMPEXE) +$(PROOFDS): $(PROOFH) $(PROOFL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PROOFH) $(PROOFL) diff --git a/proofplayer/Module.mk b/proofplayer/Module.mk index 4fe09fda919..fac0474d0f3 100644 --- a/proofplayer/Module.mk +++ b/proofplayer/Module.mk @@ -63,7 +63,7 @@ $(PROOFPLAYERLIB): $(PROOFPLAYERO) $(PROOFPLAYERDO) $(ORDER_) $(MAINLIBS) \ "$(PROOFPLAYERO) $(PROOFPLAYERDO)" \ "$(PROOFPLAYERLIBEXTRA)" -$(PROOFPLAYERDS): $(PROOFPLAYERH) $(PROOFPLAYERL) $(ROOTCINTTMPEXE) +$(PROOFPLAYERDS): $(PROOFPLAYERH) $(PROOFPLAYERL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PROOFPLAYERH) $(PROOFPLAYERL) @@ -78,7 +78,7 @@ $(PROOFDRAWLIB): $(PROOFDRAWO) $(PROOFDRAWDO) $(ORDER_) $(MAINLIBS) \ "$(PROOFDRAWO) $(PROOFDRAWDO)" \ "$(PROOFDRAWLIBEXTRA)" -$(PROOFDRAWDS): $(PROOFDRAWH) $(PROOFDRAWL) $(ROOTCINTTMPEXE) +$(PROOFDRAWDS): $(PROOFDRAWH) $(PROOFDRAWL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PROOFDRAWH) $(PROOFDRAWL) diff --git a/proofx/Module.mk b/proofx/Module.mk index 780086a261e..6e1e94606ac 100644 --- a/proofx/Module.mk +++ b/proofx/Module.mk @@ -81,7 +81,7 @@ $(PROOFXLIB): $(PROOFXO) $(PROOFXDO) $(XPCONNO) $(ORDER_) $(MAINLIBS) \ "$(PROOFXO) $(XPCONNO) $(PROOFXDO)" \ "$(PROOFXLIBEXTRA)" -$(PROOFXDS): $(PROOFXH) $(PROOFXL) $(ROOTCINTTMPEXE) $(XROOTDETAG) +$(PROOFXDS): $(PROOFXH) $(PROOFXL) $(XROOTDETAG) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PROOFXINCEXTRA) $(PROOFXH) $(PROOFXL) diff --git a/pyroot/Module.mk b/pyroot/Module.mk index 4579f41468c..962cb595707 100644 --- a/pyroot/Module.mk +++ b/pyroot/Module.mk @@ -67,7 +67,7 @@ ifeq ($(ARCH),win32) cp -f bin/$(notdir $@) $(PYROOTPYD) endif -$(PYROOTDS): $(PYROOTH) $(PYROOTL) $(ROOTCINTTMPEXE) +$(PYROOTDS): $(PYROOTH) $(PYROOTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PYROOTH) $(PYROOTL) diff --git a/pythia6/Module.mk b/pythia6/Module.mk index 897f3b760b2..9608f7cf2be 100644 --- a/pythia6/Module.mk +++ b/pythia6/Module.mk @@ -44,7 +44,7 @@ $(PYTHIA6LIB): $(PYTHIA6O) $(PYTHIA6DO) $(ORDER_) $(MAINLIBS) $(PYTHIA6LIBDEP) "$(PYTHIA6O) $(PYTHIA6DO)" \ "$(PYTHIA6LIBEXTRA) $(FPYTHIA6LIBDIR) $(FPYTHIA6LIB)" -$(PYTHIA6DS): $(PYTHIA6H) $(PYTHIA6L) $(ROOTCINTTMPEXE) +$(PYTHIA6DS): $(PYTHIA6H) $(PYTHIA6L) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(PYTHIA6H) $(PYTHIA6L) diff --git a/qt/Module.mk b/qt/Module.mk index 7fc834b9445..328d07e14e1 100644 --- a/qt/Module.mk +++ b/qt/Module.mk @@ -90,7 +90,7 @@ $(GQTLIB): $(GQTO) $(GQTDO) $(GQTMOCO) $(ORDER_) $(MAINLIBS) $(GQTLIBDEP) "$(GQTO) $(GQTMOCO) $(GQTDO)" \ "$(GQTLIBEXTRA) $(QTLIBDIR) $(QTLIB)" -$(GQTDS): $(GQTH1) $(GQTL) $(ROOTCINTTMPEXE) +$(GQTDS): $(GQTH1) $(GQTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(GQTH1) $(GQTL) @@ -128,9 +128,10 @@ endif qtcint: lib/qtcint.dll -lib/qtcint.dll: $(CINTTMP) $(ROOTCINTTMPEXE) cint/lib/qt/qtcint.h \ +lib/qtcint.dll: cint/lib/qt/qtcint.h \ cint/lib/qt/qtclasses.h cint/lib/qt/qtglobals.h \ - cint/lib/qt/qtfunctions.h + cint/lib/qt/qtfunctions.h \ + $(ROOTCINTTMPDEP) $(CINTTMP) $(MAKECINTDLL) $(PLATFORM) C++ qtcint qt \ " -p $(GQTCXXFLAGS) qtcint.h " \ "$(CINTTMP)" "$(ROOTCINTTMP)" \ diff --git a/qtgsi/Module.mk b/qtgsi/Module.mk index 428a1d09f27..8c2269e1d7d 100644 --- a/qtgsi/Module.mk +++ b/qtgsi/Module.mk @@ -59,7 +59,7 @@ $(QTGSILIB): $(QTGSIO) $(QTGSIDO) $(QTGSIMOCO) $(ORDER_) $(MAINLIBS) $(QTGSIL "$(QTGSIO) $(QTGSIDO) $(QTGSIMOCO)" \ "$(QTGSILIBEXTRA) $(QTLIBDIR) $(QTLIB)" -$(QTGSIDS): $(QTGSIH) $(QTGSIL) $(ROOTCINTTMPEXE) +$(QTGSIDS): $(QTGSIH) $(QTGSIL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c -DQTVERS=$(QTVERS) $(QTGSIH) $(QTGSIL) diff --git a/qtroot/Module.mk b/qtroot/Module.mk index eca86e12c7d..9b5a761bcf7 100644 --- a/qtroot/Module.mk +++ b/qtroot/Module.mk @@ -43,7 +43,7 @@ $(QTROOTLIB): $(QTROOTO) $(QTROOTDO) $(ORDER_) $(MAINLIBS) $(QTROOTLIBDEP) "$(SOFLAGS)" libQtRoot.$(SOEXT) $@ "$(QTROOTO) $(QTROOTDO)" \ "$(QTROOTLIBEXTRA) $(QTLIBDIR) $(QTLIB)" -$(QTROOTDS): $(QTROOTH) $(QTROOTL) $(ROOTCINTTMPEXE) +$(QTROOTDS): $(QTROOTH) $(QTROOTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(QTROOTH) $(QTROOTL) diff --git a/quadp/Module.mk b/quadp/Module.mk index 026fd6031a8..32ecea925ca 100644 --- a/quadp/Module.mk +++ b/quadp/Module.mk @@ -43,7 +43,7 @@ $(QUADPLIB): $(QUADPO) $(QUADPDO) $(ORDER_) $(MAINLIBS) $(QUADPLIBDEP) "$(SOFLAGS)" libQuadp.$(SOEXT) $@ "$(QUADPO) $(QUADPDO)" \ "$(QUADPLIBEXTRA)" -$(QUADPDS): $(QUADPH) $(QUADPL) $(ROOTCINTTMPEXE) +$(QUADPDS): $(QUADPH) $(QUADPL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(QUADPH) $(QUADPL) diff --git a/reflex/Module.mk b/reflex/Module.mk index 588fdffde12..eb155391827 100644 --- a/reflex/Module.mk +++ b/reflex/Module.mk @@ -149,7 +149,7 @@ $(REFLEXDICTLIB): $(REFLEXDO) $(ORDER_) $(MAINLIBS) $(REFLEXLIB) "$(SOFLAGS)" libReflexDict.$(SOEXT) $@ "$(REFLEXDO)" \ "$(REFLEXDICTLIBEXTRA)" -$(REFLEXDS): $(REFLEXAPIH) $(REFLEXL) $(ROOTCINTTMPEXE) +$(REFLEXDS): $(REFLEXAPIH) $(REFLEXL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c -p -Ireflex/inc $(REFLEXAPIH) $(REFLEXL) diff --git a/rfio/Module.mk b/rfio/Module.mk index 59570aa64c1..7c17f4b9b9e 100644 --- a/rfio/Module.mk +++ b/rfio/Module.mk @@ -43,7 +43,7 @@ $(RFIOLIB): $(RFIOO) $(RFIODO) $(ORDER_) $(MAINLIBS) $(RFIOLIBDEP) "$(SOFLAGS)" libRFIO.$(SOEXT) $@ "$(RFIOO) $(RFIODO)" \ "$(SHIFTLIBDIR) $(SHIFTLIB) $(RFIOLIBEXTRA)" -$(RFIODS): $(RFIOH) $(RFIOL) $(ROOTCINTTMPEXE) +$(RFIODS): $(RFIOH) $(RFIOL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(RFIOH) $(RFIOL) diff --git a/rint/Module.mk b/rint/Module.mk index fee0ccc75d4..19a080fdcd0 100644 --- a/rint/Module.mk +++ b/rint/Module.mk @@ -43,7 +43,7 @@ $(RINTLIB): $(RINTO) $(RINTDO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libRint.$(SOEXT) $@ "$(RINTO) $(RINTDO)" \ "$(RINTLIBEXTRA)" -$(RINTDS): $(RINTH) $(RINTL) $(ROOTCINTTMPEXE) +$(RINTDS): $(RINTH) $(RINTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(RINTH) $(RINTL) diff --git a/roofit/Module.mk b/roofit/Module.mk index 64f29c46454..a80f2745b7b 100644 --- a/roofit/Module.mk +++ b/roofit/Module.mk @@ -43,7 +43,7 @@ $(ROOFITLIB): $(ROOFITO) $(ROOFITDO) $(ORDER_) $(MAINLIBS) $(ROOFITLIBDEP) "$(SOFLAGS)" libRooFit.$(SOEXT) $@ "$(ROOFITO) $(ROOFITDO)" \ "$(ROOFITLIBEXTRA)" -$(ROOFITDS): $(ROOFITH) $(ROOFITL) $(ROOTCINTTMPEXE) +$(ROOFITDS): $(ROOFITH) $(ROOFITL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(ROOFITH) $(ROOFITL) diff --git a/roofitcore/Module.mk b/roofitcore/Module.mk index a732920304d..ef3cb22b5b0 100644 --- a/roofitcore/Module.mk +++ b/roofitcore/Module.mk @@ -108,15 +108,15 @@ $(ROOFITCORELIB): $(ROOFITCOREO) $(ROOFITCOREDO) $(ORDER_) $(MAINLIBS) $(ROOFITC "$(SOFLAGS)" libRooFitCore.$(SOEXT) $@ "$(ROOFITCOREO) $(ROOFITCOREDO)" \ "$(ROOFITCORELIBEXTRA)" -$(ROOFITCOREDS1): $(ROOFITCOREH1) $(ROOFITCOREL1) $(ROOTCINTTMPEXE) +$(ROOFITCOREDS1): $(ROOFITCOREH1) $(ROOFITCOREL1) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(ROOFITCOREH1) $(ROOFITCOREL1) -$(ROOFITCOREDS2): $(ROOFITCOREH2) $(ROOFITCOREL2) $(ROOTCINTTMPEXE) +$(ROOFITCOREDS2): $(ROOFITCOREH2) $(ROOFITCOREL2) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(ROOFITCOREH2) $(ROOFITCOREL2) -$(ROOFITCOREDS3): $(ROOFITCOREH3) $(ROOFITCOREL3) $(ROOTCINTTMPEXE) +$(ROOFITCOREDS3): $(ROOFITCOREH3) $(ROOFITCOREL3) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(ROOFITCOREH3) $(ROOFITCOREL3) diff --git a/ruby/Module.mk b/ruby/Module.mk index fe68d57b69a..74182af3895 100644 --- a/ruby/Module.mk +++ b/ruby/Module.mk @@ -44,7 +44,7 @@ $(RUBYROOTLIB): $(RUBYROOTO) $(RUBYROOTDO) $(ORDER_) $(MAINLIBS) $(RUBYLIBDEP) "$(RUBYROOTO) $(RUBYROOTDO)" \ "$(RUBYLIBDIR) $(RUBYLIB) $(RUBYLIBEXTRA) $(CRYPTLIBS)" -$(RUBYROOTDS): $(RUBYROOTH) $(RUBYROOTL) $(ROOTCINTTMPEXE) +$(RUBYROOTDS): $(RUBYROOTH) $(RUBYROOTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(RUBYROOTH) $(RUBYROOTL) diff --git a/sapdb/Module.mk b/sapdb/Module.mk index 179a382b08f..84723ab2ca6 100644 --- a/sapdb/Module.mk +++ b/sapdb/Module.mk @@ -43,7 +43,7 @@ $(SAPDBLIB): $(SAPDBO) $(SAPDBDO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libSapDB.$(SOEXT) $@ "$(SAPDBO) $(SAPDBDO)" \ "$(SAPDBLIBEXTRA) $(SAPDBLIBDIR) $(SAPDBCLILIB)" -$(SAPDBDS): $(SAPDBH) $(SAPDBL) $(ROOTCINTTMPEXE) +$(SAPDBDS): $(SAPDBH) $(SAPDBL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(SAPDBH) $(SAPDBL) diff --git a/sessionviewer/Module.mk b/sessionviewer/Module.mk index 3fa3f022d9d..112210e7c75 100644 --- a/sessionviewer/Module.mk +++ b/sessionviewer/Module.mk @@ -45,7 +45,7 @@ $(SESSIONVIEWERLIB): $(SESSIONVIEWERO) $(SESSIONVIEWERDO) $(ORDER_) \ "$(SESSIONVIEWERO) $(SESSIONVIEWERDO)" \ "$(SESSIONVIEWERLIBEXTRA)" -$(SESSIONVIEWERDS): $(SESSIONVIEWERH) $(SESSIONVIEWERL) $(ROOTCINTTMPEXE) +$(SESSIONVIEWERDS): $(SESSIONVIEWERH) $(SESSIONVIEWERL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(SESSIONVIEWERH) $(SESSIONVIEWERL) diff --git a/smatrix/Module.mk b/smatrix/Module.mk index 3c5256d04e0..615a6b54a74 100644 --- a/smatrix/Module.mk +++ b/smatrix/Module.mk @@ -69,13 +69,13 @@ $(SMATRIXLIB): $(SMATRIXO) $(SMATRIXDO) $(SMATRIXDO32) $(ORDER_) $(MAINLIBS) "$(SMATRIXO) $(SMATRIXDO) $(SMATRIXDO32)" \ "$(SMATRIXLIBEXTRA)" -$(SMATRIXDS): $(SMATRIXDH1) $(SMATRIXL) $(SMATRIXLINC) $(ROOTCINTTMPEXE) +$(SMATRIXDS): $(SMATRIXDH1) $(SMATRIXL) $(SMATRIXLINC) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." @echo "for files $(SMATRIXDH1)" $(ROOTCINTTMP) -f $@ -c $(SMATRIXDH1) $(SMATRIXL) # python reflex/python/genreflex/genreflex.py $(SMATRIXDIRS)/Dict.h -I$(SMATRIXDIRI) --selection_file=$(SMATRIXDIRS)/Selection.xml -o $(SMATRIXDIRS)/G__Smatrix.cxx -$(SMATRIXDS32): $(SMATRIXDH1) $(SMATRIXL32) $(SMATRIXLINC) $(ROOTCINTTMPEXE) +$(SMATRIXDS32): $(SMATRIXDH1) $(SMATRIXL32) $(SMATRIXLINC) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." @echo "for files $(SMATRIXDH1)" $(ROOTCINTTMP) -f $@ -c $(SMATRIXDH1) $(SMATRIXL32) diff --git a/spectrum/Module.mk b/spectrum/Module.mk index e483516cedb..1df2d9a4f3d 100644 --- a/spectrum/Module.mk +++ b/spectrum/Module.mk @@ -43,7 +43,7 @@ $(SPECTRUMLIB): $(SPECTRUMO) $(SPECTRUMDO) $(ORDER_) $(MAINLIBS) $(SPECTRUMLIBDE "$(SOFLAGS)" libSpectrum.$(SOEXT) $@ "$(SPECTRUMO) $(SPECTRUMDO)" \ "$(SPECTRUMLIBEXTRA)" -$(SPECTRUMDS): $(SPECTRUMH) $(SPECTRUML) $(ROOTCINTTMPEXE) +$(SPECTRUMDS): $(SPECTRUMH) $(SPECTRUML) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(SPECTRUMH) $(SPECTRUML) diff --git a/spectrumpainter/Module.mk b/spectrumpainter/Module.mk index 4898fafcdf0..d5e5b28919c 100644 --- a/spectrumpainter/Module.mk +++ b/spectrumpainter/Module.mk @@ -45,7 +45,7 @@ $(SPECTRUMPAINTERLIB): $(SPECTRUMPAINTERO) $(SPECTRUMPAINTERDO) $(ORDER_) \ "$(SPECTRUMPAINTERO) $(SPECTRUMPAINTERDO)" \ "$(SPECTRUMPAINTERLIBEXTRA)" -$(SPECTRUMPAINTERDS): $(SPECTRUMPAINTERH) $(SPECTRUMPAINTERL) $(ROOTCINTTMPEXE) +$(SPECTRUMPAINTERDS): $(SPECTRUMPAINTERH) $(SPECTRUMPAINTERL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(SPECTRUMPAINTERH) $(SPECTRUMPAINTERL) diff --git a/splot/Module.mk b/splot/Module.mk index 410cb9dd327..454e4add0fb 100644 --- a/splot/Module.mk +++ b/splot/Module.mk @@ -43,7 +43,7 @@ $(SPLOTLIB): $(SPLOTO) $(SPLOTDO) $(ORDER_) $(MAINLIBS) $(SPLOTLIBDEP) "$(SOFLAGS)" libSPlot.$(SOEXT) $@ "$(SPLOTO) $(SPLOTDO)" \ "$(SPLOTLIBEXTRA)" -$(SPLOTDS): $(SPLOTH) $(SPLOTL) $(ROOTCINTTMPEXE) +$(SPLOTDS): $(SPLOTH) $(SPLOTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(SPLOTH) $(SPLOTL) diff --git a/sql/Module.mk b/sql/Module.mk index fe6f9ba5070..4dff4eb8136 100644 --- a/sql/Module.mk +++ b/sql/Module.mk @@ -43,7 +43,7 @@ $(SQLLIB): $(SQLO) $(SQLDO) $(ORDER_) $(MAINLIBS) $(SQLLIBDEP) "$(SOFLAGS)" libSQL.$(SOEXT) $@ "$(SQLO) $(SQLDO)" \ "$(SQLLIBEXTRA)" -$(SQLDS): $(SQLH) $(SQLL) $(ROOTCINTTMPEXE) +$(SQLDS): $(SQLH) $(SQLL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(SQLH) $(SQLL) diff --git a/table/Module.mk b/table/Module.mk index 029245f6a6a..a5475c2c1bb 100644 --- a/table/Module.mk +++ b/table/Module.mk @@ -43,7 +43,7 @@ $(TABLELIB): $(TABLEO) $(TABLEDO) $(ORDER_) $(MAINLIBS) $(TABLELIBDEP) "$(SOFLAGS)" libTable.$(SOEXT) $@ "$(TABLEO) $(TABLEDO)" \ "$(TABLELIBEXTRA)" -$(TABLEDS): $(TABLEH) $(TABLEL) $(ROOTCINTTMPEXE) +$(TABLEDS): $(TABLEH) $(TABLEL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(TABLEH) $(TABLEL) diff --git a/thread/Module.mk b/thread/Module.mk index 2bfc003c000..3836c2b8c97 100644 --- a/thread/Module.mk +++ b/thread/Module.mk @@ -82,7 +82,7 @@ $(THREADLIB): $(THREADO) $(THREADDO) $(ORDER_) $(MAINLIBS) $(THREADLIBDEP) "$(SOFLAGS)" libThread.$(SOEXT) $@ "$(THREADO) $(THREADDO)" \ "$(THREADLIBEXTRA) $(OSTHREADLIBDIR) $(OSTHREADLIB)" -$(THREADDS): $(THREADH) $(THREADL) $(ROOTCINTTMPEXE) +$(THREADDS): $(THREADH) $(THREADL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(THREADH) $(THREADL) @@ -105,7 +105,7 @@ distclean:: distclean-thread ##### cintdlls ###### ifneq ($(ARCH),win32) -$(CINTDIRDLLS)/pthread.dll: $(CINTTMP) $(ROOTCINTTMPEXE) cint/lib/pthread/pthd.h +$(CINTDIRDLLS)/pthread.dll: cint/lib/pthread/pthd.h $(ROOTCINTTMPDEP) $(CINTTMP) @$(MAKECINTDLL) $(PLATFORM) C pthread pthread pthd.h \ "$(CINTTMP)" "$(ROOTCINTTMP)" \ "$(MAKELIB)" "$(CXX)" "$(CC)" "$(LD)" "$(OPT)" "$(CINTCXXFLAGS)" \ diff --git a/tmva/Module.mk b/tmva/Module.mk index b0bb36d0a67..7662b28dc3a 100644 --- a/tmva/Module.mk +++ b/tmva/Module.mk @@ -48,7 +48,7 @@ $(TMVALIB): $(TMVAO) $(TMVADO) $(ORDER_) $(MAINLIBS) $(TMVALIBDEP) "$(SOFLAGS)" libTMVA.$(SOEXT) $@ "$(TMVAO) $(TMVADO)" \ "$(TMVALIBEXTRA)" -$(TMVADS): $(TMVAH_CINT) $(TMVAL) $(ROOTCINTTMPEXE) +$(TMVADS): $(TMVAH_CINT) $(TMVAL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(TMVAH_CINT) $(TMVAL) diff --git a/tree/Module.mk b/tree/Module.mk index e4255a8390c..9a3ea6ff2df 100644 --- a/tree/Module.mk +++ b/tree/Module.mk @@ -50,7 +50,7 @@ $(TREELIB): $(TREEO) $(TREEDO) $(ORDER_) $(MAINLIBS) $(TREELIBDEP) "$(SOFLAGS)" libTree.$(SOEXT) $@ "$(TREEO) $(TREEDO)" \ "$(TREELIBEXTRA)" -$(TREEDS): $(TREEH) $(TREEL) $(ROOTCINTTMPEXE) +$(TREEDS): $(TREEH) $(TREEL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(TREEH) $(TREEL) diff --git a/treeplayer/Module.mk b/treeplayer/Module.mk index 5ae2c63fb59..186a54e476a 100644 --- a/treeplayer/Module.mk +++ b/treeplayer/Module.mk @@ -45,7 +45,7 @@ $(TREEPLAYERLIB): $(TREEPLAYERO) $(TREEPLAYERDO) $(ORDER_) $(MAINLIBS) \ "$(TREEPLAYERO) $(TREEPLAYERDO)" \ "$(TREEPLAYERLIBEXTRA)" -$(TREEPLAYERDS): $(TREEPLAYERH) $(TREEPLAYERL) $(ROOTCINTTMPEXE) +$(TREEPLAYERDS): $(TREEPLAYERH) $(TREEPLAYERL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(TREEPLAYERH) $(TREEPLAYERL) diff --git a/treeviewer/Module.mk b/treeviewer/Module.mk index aa9f7443c80..9fa79211677 100644 --- a/treeviewer/Module.mk +++ b/treeviewer/Module.mk @@ -58,7 +58,7 @@ $(TREEVIEWERLIB): $(TREEVIEWERO) $(TREEVIEWERDO) $(ORDER_) $(MAINLIBS) \ "$(TREEVIEWERO) $(TREEVIEWERDO)" \ "$(TREEVIEWERLIBEXTRA)" -$(TREEVIEWERDS): $(TREEVIEWERH) $(TREEVIEWERL) $(ROOTCINTTMPEXE) +$(TREEVIEWERDS): $(TREEVIEWERH) $(TREEVIEWERL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(TREEVIEWERH) $(TREEVIEWERL) diff --git a/unix/Module.mk b/unix/Module.mk index 8c229176cea..14f4be636c2 100644 --- a/unix/Module.mk +++ b/unix/Module.mk @@ -33,7 +33,7 @@ INCLUDEFILES += $(UNIXDEP) include/%.h: $(UNIXDIRI)/%.h cp $< $@ -$(UNIXDS): $(UNIXH) $(UNIXL) $(ROOTCINTTMPEXE) +$(UNIXDS): $(UNIXH) $(UNIXL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(UNIXH) $(UNIXL) diff --git a/unuran/Module.mk b/unuran/Module.mk index 807cf07633a..669a91099d7 100644 --- a/unuran/Module.mk +++ b/unuran/Module.mk @@ -120,7 +120,7 @@ $(UNURANLIB): $(UNRCFG) $(UNRO) $(UNURANO) $(UNURANDO) $(ORDER_) $(MAINLIBS) $ "$(UNURANO) $(UNURANDO)" \ "$(UNURANLIBEXTRA) $(UNRO)" -$(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPEXE) +$(UNURANDS): $(UNRINIT) $(UNURANDH1) $(UNURANL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(UNRFLAGS) $(UNURANDH1) $(UNURANL) diff --git a/utils/src/rootcint.cxx b/utils/src/rootcint.cxx index 8b7beebb5b6..cec89bfdb37 100644 --- a/utils/src/rootcint.cxx +++ b/utils/src/rootcint.cxx @@ -163,6 +163,7 @@ #include "RConfig.h" #include "Shadow.h" #include <iostream> +#include "cintdictversion.h" #ifdef fgets // in G__ci.h # undef fgets diff --git a/vmc/Module.mk b/vmc/Module.mk index f60f372076a..acebc1f644d 100644 --- a/vmc/Module.mk +++ b/vmc/Module.mk @@ -44,7 +44,7 @@ $(VMCLIB): $(VMCO) $(VMCDO) $(ORDER_) $(MAINLIBS) $(VMCLIBDEP) "$(SOFLAGS)" libVMC.$(SOEXT) $@ "$(VMCO) $(VMCDO)" \ "$(VMCLIBEXTRA)" -$(VMCDS): $(VMCH1) $(VMCL) $(ROOTCINTTMPEXE) +$(VMCDS): $(VMCH1) $(VMCL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(VMCH1) $(VMCL) diff --git a/win32gdk/Module.mk b/win32gdk/Module.mk index 51864b676fc..df66982aea9 100644 --- a/win32gdk/Module.mk +++ b/win32gdk/Module.mk @@ -93,7 +93,7 @@ $(WIN32GDKLIB): $(WIN32GDKO) $(WIN32GDKDO) $(FREETYPEDEP) $(GDKLIB) $(GDKDLL) \ "$(WIN32GDKO) $(WIN32GDKDO)" \ "$(FREETYPELDFLAGS) $(FREETYPELIB) $(GDKLIB) $(WIN32GDKLIBEXTRA) $(GDKLIBS) Glu32.lib Opengl32.lib" -$(WIN32GDKDS): $(WIN32GDKH1) $(WIN32GDKL) $(ROOTCINTTMPEXE) +$(WIN32GDKDS): $(WIN32GDKH1) $(WIN32GDKL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(WIN32GDKH1) $(WIN32GDKL) diff --git a/winnt/Module.mk b/winnt/Module.mk index 869903ff8eb..4388ee96060 100644 --- a/winnt/Module.mk +++ b/winnt/Module.mk @@ -34,7 +34,7 @@ INCLUDEFILES += $(WINNTDEP) include/%.h: $(WINNTDIRI)/%.h cp $< $@ -$(WINNTDS): $(WINNTH1) $(WINNTL) $(ROOTCINTTMPEXE) +$(WINNTDS): $(WINNTH1) $(WINNTL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(WINNTH1) $(WINNTL) diff --git a/x11/Module.mk b/x11/Module.mk index 7723aac45a0..e86f6ab994d 100644 --- a/x11/Module.mk +++ b/x11/Module.mk @@ -45,7 +45,7 @@ $(X11LIB): $(X11O) $(X11DO) $(ORDER_) $(MAINLIBS) "$(SOFLAGS)" libGX11.$(SOEXT) $@ "$(X11O) $(X11DO)" \ "$(X11LIBEXTRA) $(XLIBS)" -$(X11DS): $(X11H1) $(X11L) $(ROOTCINTTMPEXE) +$(X11DS): $(X11H1) $(X11L) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(X11H1) $(X11L) diff --git a/x11ttf/Module.mk b/x11ttf/Module.mk index c441735d6a7..65a53e3c81d 100644 --- a/x11ttf/Module.mk +++ b/x11ttf/Module.mk @@ -49,7 +49,7 @@ $(X11TTFLIB): $(X11TTFO) $(X11TTFDO) $(FREETYPEDEP) $(ORDER_) $(MAINLIBS) $(X1 "$(FREETYPELDFLAGS) $(FREETYPELIB) \ $(X11TTFLIBEXTRA) $(XLIBS)" -$(X11TTFDS): $(X11TTFH) $(X11TTFL) $(ROOTCINTTMPEXE) +$(X11TTFDS): $(X11TTFH) $(X11TTFL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(FREETYPEINC) $(X11TTFH) $(X11TTFL) diff --git a/x3d/Module.mk b/x3d/Module.mk index ea0c74fa51f..acf52704ea3 100644 --- a/x3d/Module.mk +++ b/x3d/Module.mk @@ -46,7 +46,7 @@ $(X3DLIB): $(X3DO) $(X3DDO) $(ORDER_) $(MAINLIBS) $(X3DLIBDEP) "$(SOFLAGS)" libX3d.$(SOEXT) $@ "$(X3DO) $(X3DDO)" \ "$(X3DLIBEXTRA) $(XLIBS)" -$(X3DDS): $(X3DH1) $(X3DL) $(ROOTCINTTMPEXE) +$(X3DDS): $(X3DH1) $(X3DL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(X3DH1) $(X3DL) diff --git a/xml/Module.mk b/xml/Module.mk index 80499071a3f..b924139cab6 100644 --- a/xml/Module.mk +++ b/xml/Module.mk @@ -43,7 +43,7 @@ $(XMLLIB): $(XMLO) $(XMLDO) $(ORDER_) $(MAINLIBS) $(XMLLIBDEP) "$(SOFLAGS)" libXMLIO.$(SOEXT) $@ "$(XMLO) $(XMLDO)" \ "$(XMLLIBEXTRA)" -$(XMLDS): $(XMLH) $(XMLL) $(ROOTCINTTMPEXE) +$(XMLDS): $(XMLH) $(XMLL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(XMLH) $(XMLL) diff --git a/xmlparser/Module.mk b/xmlparser/Module.mk index 095b7c0dbc4..0bc962c8310 100644 --- a/xmlparser/Module.mk +++ b/xmlparser/Module.mk @@ -44,7 +44,7 @@ $(XMLPARSERLIB): $(XMLPARSERO) $(XMLPARSERDO) $(ORDER_) $(MAINLIBS) "$(XMLPARSERO) $(XMLPARSERDO)" \ "$(XMLLIBDIR) $(XMLCLILIB)" -$(XMLPARSERDS): $(XMLPARSERH) $(XMLPARSERL) $(ROOTCINTTMPEXE) +$(XMLPARSERDS): $(XMLPARSERH) $(XMLPARSERL) $(ROOTCINTTMPDEP) @echo "Generating dictionary $@..." $(ROOTCINTTMP) -f $@ -c $(XMLPARSERH) $(XMLPARSERL) -- GitLab