From 0ab88198254fd3671689de99856c45b173d0dce6 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Sat, 10 Dec 2005 01:10:45 +0000
Subject: [PATCH] From Axel: handle in a consistent way the new rootcint
options -cint (default), -reflex and -gccxml. The type of dictionary to be
used can be specified like: ./configure --with-dicttype=reflex. Notice that
this option is there only for the developers working on the migration to the
new dictionary system.
git-svn-id: http://root.cern.ch/svn/root/trunk@13609 27541ba8-7e3a-0410-8455-c3a389f83636
---
Makefile | 16 +++++++--
alien/Module.mk | 2 +-
asimage/Module.mk | 6 ++--
auth/Module.mk | 2 +-
base/Module.mk | 6 ++--
build/unix/makelib.sh | 10 ++++--
build/win/makelib.sh | 12 +++++--
chirp/Module.mk | 2 +-
clarens/Module.mk | 2 +-
clib/Module.mk | 2 +-
config/Makefile.in | 7 ++++
config/root-config.in | 12 ++++++-
config/rootrc.in | 6 ++--
configure | 84 +++++++++++++++++++++++++++++++++++++++++++
cont/Module.mk | 2 +-
dcache/Module.mk | 2 +-
eg/Module.mk | 2 +-
foam/Module.mk | 2 +-
fumili/Module.mk | 2 +-
g3d/Module.mk | 2 +-
ged/Module.mk | 2 +-
gedold/Module.mk | 2 +-
geom/Module.mk | 4 +--
geompainter/Module.mk | 2 +-
gl/Module.mk | 2 +-
gpad/Module.mk | 2 +-
graf/Module.mk | 4 +--
gui/Module.mk | 6 ++--
guibuilder/Module.mk | 2 +-
hbook/Module.mk | 2 +-
hist/Module.mk | 2 +-
histpainter/Module.mk | 2 +-
html/Module.mk | 2 +-
krb5auth/Module.mk | 2 +-
ldap/Module.mk | 2 +-
mathcore/Module.mk | 2 +-
mathmore/Module.mk | 2 +-
matrix/Module.mk | 2 +-
meta/Module.mk | 2 +-
minuit/Module.mk | 2 +-
minuit2/Module.mk | 2 +-
mlp/Module.mk | 2 +-
mysql/Module.mk | 2 +-
net/Module.mk | 2 +-
netx/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 | 4 +--
pyroot/Module.mk | 2 +-
pythia/Module.mk | 2 +-
pythia6/Module.mk | 2 +-
qt/Module.mk | 2 +-
qtroot/Module.mk | 2 +-
quadp/Module.mk | 2 +-
rfio/Module.mk | 2 +-
rint/Module.mk | 2 +-
roofit/Module.mk | 8 ++---
ruby/Module.mk | 2 +-
sapdb/Module.mk | 2 +-
smatrix/Module.mk | 2 +-
splot/Module.mk | 2 +-
sql/Module.mk | 2 +-
table/Module.mk | 2 +-
thread/Module.mk | 2 +-
tree/Module.mk | 2 +-
treeplayer/Module.mk | 2 +-
treeviewer/Module.mk | 2 +-
unix/Module.mk | 2 +-
utils/Module.mk | 12 +++----
venus/Module.mk | 2 +-
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 +-
81 files changed, 229 insertions(+), 102 deletions(-)
diff --git a/Makefile b/Makefile
index 4041e0dc2c7..79213942a35 100644
--- a/Makefile
+++ b/Makefile
@@ -87,6 +87,9 @@ endif
ifeq ($(BUILDDCAP),yes)
MODULES += dcache
endif
+ifeq ($(BUILDGFAL),yes)
+MODULES += gfal
+endif
ifeq ($(BUILDCHIRP),yes)
MODULES += chirp
endif
@@ -177,7 +180,7 @@ ifneq ($(findstring $(MAKECMDGOALS),distclean maintainer-clean),)
MODULES += unix winnt x11 x11ttf win32gdk gl rfio thread \
pythia pythia6 venus table mysql pgsql sapdb srputils x3d \
rootx rootd proofd proof dcache chirp hbook alien asimage \
- ldap mlp krb5auth rpdutils globusauth pyroot ruby \
+ ldap mlp krb5auth rpdutils globusauth pyroot ruby gfal \
qt qtroot xrootd netx clarens peac oracle xmlparser \
mathcore mathmore reflex cintex roofit minuit2
MODULES := $(sort $(MODULES)) # removes duplicates
@@ -271,6 +274,11 @@ endif
##### Utilities #####
+ifneq ($(ROOTDICTTYPE),cint)
+ROOTCINTTMP = $(ROOTCINTTMPEXE) $(addprefix -,$(ROOTDICTTYPE))
+else
+ROOTCINTTMP = $(ROOTCINTTMPEXE)
+endif
MAKEDEP = build/unix/depend.sh
MAKELIB = build/unix/makelib.sh $(MKLIBOPTIONS)
MAKEDIST = build/unix/makedist.sh
@@ -314,6 +322,9 @@ CORELIB := $(LPATH)/libCore.$(SOEXT)
ifeq ($(EXPLICITLINK),yes)
MAINLIBS = $(CORELIB) $(CINTLIB)
+ifneq ($(ROOTDICTTYPE),cint)
+MAINLIBS := $(MAINLIBS) $(REFLEXLIB)
+endif
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 '|')
@@ -628,7 +639,7 @@ maintainer-clean:: distclean
version: $(CINTTMP)
@$(MAKEVERSION)
-cintdlls: $(CINTTMP) $(ROOTCINTTMP)
+cintdlls: $(CINTTMP) $(ROOTCINTTMPEXE)
@$(MAKECINTDLLS) $(PLATFORM) "$(CINTTMP)" "$(ROOTCINTTMP)" \
"$(MAKELIB)" "$(CXX)" "$(CC)" "$(LD)" "$(OPT)" "$(CINTCXXFLAGS)" \
"$(CINTCFLAGS)" "$(LDFLAGS)" "$(SOFLAGS)" "$(SOEXT)" "$(COMPILER)"
@@ -874,6 +885,7 @@ showbuild:
@echo "OSTHREADLIB = $(OSTHREADLIB)"
@echo "SHIFTLIB = $(SHIFTLIB)"
@echo "DCAPLIB = $(DCAPLIB)"
+ @echo "GFALLIB = $(GFALLIB)"
@echo "MYSQLINCDIR = $(MYSQLINCDIR)"
@echo "ORACLEINCDIR = $(ORACLEINCDIR)"
@echo "PGSQLINCDIR = $(PGSQLINCDIR)"
diff --git a/alien/Module.mk b/alien/Module.mk
index 5d5b3ad69bc..1a94b57bf22 100644
--- a/alien/Module.mk
+++ b/alien/Module.mk
@@ -41,7 +41,7 @@ $(ALIENLIB): $(ALIENO) $(ALIENDO) $(ORDER_) $(MAINLIBS) $(ALIENLIBDEP)
"$(SOFLAGS)" libRAliEn.$(SOEXT) $@ "$(ALIENO) $(ALIENDO)" \
"$(ALIENLIBEXTRA) $(ALIENLIBDIR) $(ALIENCLILIB)"
-$(ALIENDS): $(ALIENH) $(ALIENL) $(ROOTCINTTMP)
+$(ALIENDS): $(ALIENH) $(ALIENL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(ALIENH) $(ALIENL)
diff --git a/asimage/Module.mk b/asimage/Module.mk
index 097af0db3b4..8e900f3c1df 100644
--- a/asimage/Module.mk
+++ b/asimage/Module.mk
@@ -199,7 +199,7 @@ $(ASIMAGELIB): $(ASIMAGEO) $(ASIMAGEDO) $(ASTEPDEP) $(FREETYPEDEP) \
$(FREETYPELDFLAGS) $(FREETYPELIB) \
$(ASEXTRALIBDIR) $(ASEXTRALIB) $(XLIBS)"
-$(ASIMAGEDS): $(ASIMAGEH) $(ASIMAGEL) $(ROOTCINTTMP)
+$(ASIMAGEDS): $(ASIMAGEH) $(ASIMAGEL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(ASIMAGEH) $(ASIMAGEL)
@@ -216,7 +216,7 @@ $(ASIMAGEGUILIB): $(ASIMAGEGUIO) $(ASIMAGEGUIDO) $(ASTEPDEP) $(FREETYPEDEP) \
$(FREETYPELDFLAGS) $(FREETYPELIB) \
$(ASEXTRALIBDIR) $(ASEXTRALIB) $(XLIBS)"
-$(ASIMAGEGUIDS): $(ASIMAGEGUIH) $(ASIMAGEGUIL) $(ROOTCINTTMP)
+$(ASIMAGEGUIDS): $(ASIMAGEGUIH) $(ASIMAGEGUIL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(ASIMAGEGUIH) $(ASIMAGEGUIL)
@@ -233,7 +233,7 @@ $(ASIMAGEGSLIB): $(ASIMAGEGSO) $(ASIMAGEGSDO) $(ASTEPDEP) $(FREETYPEDEP) \
$(FREETYPELDFLAGS) $(FREETYPELIB) \
$(ASEXTRALIBDIR) $(ASEXTRALIB) $(XLIBS)"
-$(ASIMAGEGSDS): $(ASIMAGEGSH) $(ASIMAGEGSL) $(ROOTCINTTMP)
+$(ASIMAGEGSDS): $(ASIMAGEGSH) $(ASIMAGEGSL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(ASIMAGEGSH) $(ASIMAGEGSL)
diff --git a/auth/Module.mk b/auth/Module.mk
index 2b2db1ef514..6eedf8abecf 100644
--- a/auth/Module.mk
+++ b/auth/Module.mk
@@ -60,7 +60,7 @@ $(RAUTHLIB): $(RAUTHO) $(RAUTHDO) $(ORDER_) $(MAINLIBS) $(RAUTHLIBDEP)
"$(SOFLAGS)" libRootAuth.$(SOEXT) $@ "$(RAUTHO) $(RAUTHDO)" \
"$(RAUTHLIBEXTRA) $(EXTRA_RAUTHLIBS)"
-$(RAUTHDS): $(RAUTHH) $(RAUTHL) $(ROOTCINTTMP)
+$(RAUTHDS): $(RAUTHH) $(RAUTHL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(RAUTHH) $(RAUTHL)
diff --git a/base/Module.mk b/base/Module.mk
index 69f6162460a..dea6458204e 100644
--- a/base/Module.mk
+++ b/base/Module.mk
@@ -68,13 +68,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) $(ROOTCINTTMP)
+$(BASEDS1): $(BASEH1) $(BASEL1) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(BASEH1) $(BASEL1)
-$(BASEDS2): $(BASEH1) $(BASEL2) $(ROOTCINTTMP)
+$(BASEDS2): $(BASEH1) $(BASEL2) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(BASEH1) $(BASEL2)
-$(BASEDS3): $(BASEH3) $(BASEL3) $(ROOTCINTTMP)
+$(BASEDS3): $(BASEH3) $(BASEL3) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(BASEH3) $(BASEL3)
# pre-requisites intentionally not specified... should be called only
diff --git a/build/unix/makelib.sh b/build/unix/makelib.sh
index d1caa34e879..c563478f4fc 100755
--- a/build/unix/makelib.sh
+++ b/build/unix/makelib.sh
@@ -42,11 +42,15 @@ fi
VERSION=
EXPLLNKCORE=
if [ "x$EXPLICIT" = "xyes" ]; then
- if [ $LIB != "lib/libCint.$soext" ]; then
+ if [ $LIB != "lib/libCint.$soext" -a $LIB != "lib/libReflex.$soext" ]; then
+ NEEDREFLEX=""
+ if [ "$(bin/root-config --dicttype)" != "cint" ]; then
+ NEEDREFLEX="-lReflex"
+ fi
if [ $LIB != "lib/libCore.$soext" ]; then
- EXPLLNKCORE="-Llib -lCore -lCint"
+ EXPLLNKCORE="-Llib -lCore -lCint $NEEDREFLEX"
else
- EXPLLNKCORE="-Llib -lCint"
+ EXPLLNKCORE="-Llib -lCint $NEEDREFLEX"
fi
fi
fi
diff --git a/build/win/makelib.sh b/build/win/makelib.sh
index f48b994c526..22fef13a902 100755
--- a/build/win/makelib.sh
+++ b/build/win/makelib.sh
@@ -55,13 +55,21 @@ if [ "$R__PLATFORM" = "win32" ]; then
if [ "$R__LIB" = "lib/libCint.dll" ]; then
cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o bin/${name}.dll $R__OBJS \
lib/${name}.exp $syslibs"
+ elif [ "$R__LIB" = "lib/libReflex.dll" ]; then
+ cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o bin/${name}.dll $R__OBJS \
+ lib/${name}.exp $R__EXTRA $syslibs"
elif [ "$R__LIB" = "lib/libCore.dll" ]; then
+ if [ "$(bin/root-config --dicttype)" != "cint" ]; then
+ needReflex="lib/libReflex.lib"
+ fi
cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o bin/${name}.dll $R__OBJS \
- lib/${name}.exp lib/libCint.lib $R__EXTRA $syslibs WSock32.lib \
+ lib/${name}.exp lib/libCint.lib $needReflex\
+ $R__EXTRA $syslibs WSock32.lib \
Oleaut32.lib Iphlpapi.lib"
else
cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o bin/${name}.dll $R__OBJS \
- lib/${name}.exp $R__EXTRA lib/libCore.lib lib/libCint.lib \
+ lib/${name}.exp $R__EXTRA lib/libCore.lib \
+ lib/libCint.lib $needReflex \
$syslibs"
fi
echo $cmd
diff --git a/chirp/Module.mk b/chirp/Module.mk
index 3abae9440a8..9adaece93eb 100644
--- a/chirp/Module.mk
+++ b/chirp/Module.mk
@@ -40,7 +40,7 @@ $(CHIRPLIB): $(CHIRPO) $(CHIRPDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libChirp.$(SOEXT) $@ "$(CHIRPO) $(CHIRPDO)" \
"$(CHIRPLIBEXTRA) $(CHIRPLIBDIR) $(CHIRPCLILIB)"
-$(CHIRPDS): $(CHIRPH) $(CHIRPL) $(ROOTCINTTMP)
+$(CHIRPDS): $(CHIRPH) $(CHIRPL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(CHIRPH) $(CHIRPL)
diff --git a/clarens/Module.mk b/clarens/Module.mk
index 5e3a4a73a7f..2fda44763c3 100644
--- a/clarens/Module.mk
+++ b/clarens/Module.mk
@@ -42,7 +42,7 @@ $(CLARENSLIB): $(CLARENSO) $(CLARENSDO) $(ORDER_) $(MAINLIBS) $(CLARENSLIBDEP)
"$(CLARENSO) $(CLARENSDO) $(CLARENSLIBS)" \
"$(CLARENSLIBEXTRA)"
-$(CLARENSDS): $(CLARENSH) $(CLARENSL) $(ROOTCINTTMP)
+$(CLARENSDS): $(CLARENSH) $(CLARENSL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(CLARENSH) $(CLARENSL)
diff --git a/clib/Module.mk b/clib/Module.mk
index f9df2aae895..c14207f18c2 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) $(ROOTCINTTMP)
+$(CLIBDS): $(CLIBDIRI)/Getline.h $(CLIBL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(CLIBDIRI)/Getline.h $(CLIBL)
diff --git a/config/Makefile.in b/config/Makefile.in
index 6c677ec1486..835e0c5fc63 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -100,6 +100,11 @@ DCAPLIBDIR := @dcaplibdir@
DCAPLIB := @dcaplib@
DCAPINCDIR := $(filter-out /usr/include, @dcapincdir@)
+BUILDGFAL := @buildgfal@
+GFALLIBDIR := @gfallibdir@
+GFALCLILIB := @gfallib@
+GFALINCDIR := $(filter-out /usr/include, @gfalincdir@)
+
BUILDCHIRP := @buildchirp@
CHIRPLIBDIR := @chirplibdir@
CHIRPCLILIB := @chirplib@
@@ -216,6 +221,8 @@ BUILDPEAC := @buildpeac@
CPPUNIT := @cppunit@
GCCXML := @gccxml@
+ROOTDICTTYPE := @dicttype@
+
INSTALL := cp -dpR
INSTALLDATA := cp -dpR
INSTALLDIR := mkdir -p
diff --git a/config/root-config.in b/config/root-config.in
index 6bc09a70cd7..2a85c0ea6df 100755
--- a/config/root-config.in
+++ b/config/root-config.in
@@ -12,6 +12,7 @@ libdir=@libdir@
incdir=@incdir@
features="@features@"
configargs="@configargs@"
+dicttype=@dicttype@
if test "$platform" = "win32"; then
bindir=`cygpath -u $bindir`
@@ -25,6 +26,11 @@ newlib="-lNew"
rootlibs="-lCore -lCint -lHist -lGraf -lGraf3d -lGpad -lTree -lRint \
-lPostscript -lMatrix -lPhysics"
rootglibs="-lGui"
+
+if test "$dicttype" = "reflex" -o "$dicttype" = "gccxml"; then
+ rootlibs="$rootlibs -lReflex"
+fi
+
if test "$platform" = "win32"; then
rootulibs="-include:_G__cpp_setupG__Hist \
-include:_G__cpp_setupG__Graf1 \
@@ -410,7 +416,7 @@ noauxcflags=no
noldflags=no
usage="\
-Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--auxcflags] [--ldflags] [--new] [--nonew] [--libs] [--glibs] [--bindir] [--libdir] [--incdir] [--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch] [--platform] [--help]"
+Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--auxcflags] [--ldflags] [--new] [--nonew] [--libs] [--glibs] [--bindir] [--libdir] [--incdir] [--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch] [--platform] [--dicttype] [--help]"
if test $# -eq 0; then
echo "${usage}" 1>&2
@@ -637,6 +643,10 @@ while test $# -gt 0; do
### output the configure arguments
out="$out $configargs"
;;
+ --dicttype)
+ ### output the dictionary type
+ out="$out $dicttype"
+ ;;
--help)
### Print a help message
echo "Usage: `basename $0` [options]"
diff --git a/config/rootrc.in b/config/rootrc.in
index 193a62dd513..02df2c8f762 100644
--- a/config/rootrc.in
+++ b/config/rootrc.in
@@ -1,4 +1,4 @@
-# @(#)root/config:$Name: $:$Id: rootrc.in,v 1.121 2005/11/28 10:22:44 couet Exp $
+# @(#)root/config:$Name: $:$Id: rootrc.in,v 1.122 2005/12/07 14:49:24 rdm Exp $
# Author: Fons Rademakers 22/09/95
# ROOT Environment settings are handled via the class TEnv. To see
@@ -329,7 +329,8 @@ RSA.KeyType: 1
# In case the file namespace descriptor ends with - the namespace
# is not a part of the filename.
# Extend in private .rootrc with a +Url.Special line.
-Url.Special: file: rfio: hpss: castor: dcache: dcap: /alien/- /castor/
+Url.Special: file: rfio: hpss: castor: dcache: dcap: gfal:
++Url.Special: /alien/- /castor/
# The following env vars are handled by TXNetFile and related classes
# (module netx, libNetx.so).
@@ -405,6 +406,7 @@ Plugin.TFile: ^rfio: TRFIOFile RFIO "TRFIOFile(const char*,Opti
+Plugin.TFile: ^castor: TCastorFile RFIO "TCastorFile(const char*,Option_t*,const char*,Int_t,Int_t)"
+Plugin.TFile: ^dcache: TDCacheFile DCache "TDCacheFile(const char*,Option_t*,const char*,Int_t)"
+Plugin.TFile: ^dcap: TDCacheFile DCache "TDCacheFile(const char*,Option_t*,const char*,Int_t)"
++Plugin.TFile: ^gfal: TGFALFile GFAL "TGFALFile(const char*,Option_t*,const char*,Int_t)"
+Plugin.TFile: ^chirp: TChirpFile Chirp "TChirpFile(const char*,Option_t*,const char*,Int_t)"
+Plugin.TFile: ^alien: TAlienFile RAliEn "TAlienFile(const char*,Option_t*,const char*,Int_t)"
+Plugin.TFile: .+[.]xml$ TXMLFile XMLIO "TXMLFile(const char*,Option_t*,const char*,Int_t)"
diff --git a/configure b/configure
index d79f01c22a2..8bee8c1000e 100755
--- a/configure
+++ b/configure
@@ -35,6 +35,7 @@ options=" \
enable_dcache \
enable_exceptions \
enable_explicitlink \
+ enable_gfal \
enable_globus \
enable_krb5 \
enable_ldap \
@@ -106,6 +107,7 @@ PGSQL \
QTDIR \
SAPDB \
RFIO \
+GFAL \
CERNLIB \
PYTHIA \
PYTHIA6 \
@@ -126,6 +128,7 @@ ROOFIT \
MINUIT2 \
TABLE \
XMLDIR \
+ROOTDICTTYPE \
"
configenvvars=
for c in $envvars ; do
@@ -728,6 +731,7 @@ enable/disable options, prefix with either --enable- or --disable-
dcache dCache support, requires libdcap from DESY
exceptions Turn on compiler exception handling capability
explicitlink Explicitly link with all dependent libraries
+ gfal GFAL support, requires libgfal
globus Globus authentication support, requires Globus toolkit
krb5 Kerberos5 support, requires Kerberos libs
ldap LDAP support, requires (Open)LDAP libs
@@ -771,6 +775,7 @@ with options, prefix with --with-, enables corresponding support
cppunit Cppunit testing, directory of the cppunit installation
dcap-incdir dCache support, location of dcap.h
dcap-libdir dCache support, location of libdcap
+ dicttype dictionary type: "cint" (default), "reflex", or "gccxml"
globus Globus support, path to what should be GLOBUS_LOCATION
gccxml Gccxml support, directory of the gccxml installation
krb5 Kerberos5 support, location of Kerberos distribution
@@ -924,6 +929,9 @@ if test $# -gt 0 ; then
--with-cppunit=*) cppunit=$optarg ;;
--with-dcap-incdir=*) dcapincdir=$optarg ; enable_dcache="yes" ;;
--with-dcap-libdir=*) dcaplibdir=$optarg ; enable_dcache="yes" ;;
+ --with-dicttype=*) dicttype=$optarg ;;
+ --with-gfal-incdir=*) gfalincdir=$optarg ; enable_gfal="yes" ;;
+ --with-gfal-libdir=*) gfallibdir=$optarg ; enable_gfal="yes" ;;
--with-globus=*) globusdir=$optarg ; enable_globus="yes" ;;
--with-gccxml=*) gccxml=$optarg ;;
--with-krb5=*) krb5dir=$optarg ; enable_krb5="yes" ;;
@@ -1561,6 +1569,34 @@ if test ! "x$enable_rfio" = "xno" ; then
fi
fi
+######################################################################
+#
+### echo %%% GFAL Support - Third party libraries
+#
+# (See http://grid-deployment.web.cern.ch/grid-deployment/gis/GFAL/gfal.3.html)
+#
+# If the user has set the flags "--disable-gfal", we don't check for
+# GFAL at all.
+#
+if test ! "x$enable_gfal" = "xno"; then
+ # Check for GFAL include and library
+ check_header "gfal_api.h" "$gfalincdir" $GFAL $GFAL/include \
+ /opt/lcg/include /opt/gfal/include /usr/local/lcg/include \
+ /usr/local/gfal/include
+ gfalinc=$found_hdr
+ gfalincdir=$found_dir
+
+ check_library "libgfal" "$enable_shared" "$gfallibdir" \
+ $GFAL $GFAL/lib /opt/lcg/lib /opt/gfal/lib /usr/local/lcg/lib \
+ /usr/local/gfal/lib
+ gfallib=$found_lib
+ gfallibdir=$found_dir
+
+ if test "x$gfalincdir" = "x" || test "x$gfallib" = "x"; then
+ enable_gfal="no"
+ fi
+fi
+
######################################################################
#
### echo %%% CERNLIB Usage - Third party libraries
@@ -3042,6 +3078,47 @@ fi
echo "$buildpeac"
+######################################################################
+#
+### echo %%% What dictionaries to build
+#
+# Can be either cint (default), reflex, or gccxml.
+# Option will be passed to rootcint(_tmp),
+# and root-config --libs will have -lReflex if needed.
+#
+
+# --with-dicttype overrides env var ROOTDICTTYPE
+if test "x$dicttype" = "x" ; then
+ dicttype="$ROOTDICTTYPE"
+fi
+
+# set default to cint
+if test "x$dicttype" = "x"; then
+ dicttype=cint
+fi
+
+case "$dicttype" in
+ cint);;
+ reflex | gccxml)
+ # check that cintex is enabled for reflex/gccxml
+ if ! test "x$enable_cintex" = "xyes"; then
+ echo "Cannot generate $dicttype dictionaries with cintex disabled."
+ dicttype=cint
+ fi ;;
+ *)
+ echo "Unknown dictionary \"$dicttype\"."
+ echo " Must be one of cint, reflex, gccxml."
+ dicttype=cint
+ ROOTDICTTYPE="trigger print info"
+ ;;
+esac
+
+# Print info if dicttype!=cint, or --with-dict overrides $ROOTDICTTYPE
+if test ! "x$dicttype" = "xcint" \
+ -o ! "x$dicttype" = "x$ROOTDICTTYPE"; then
+ echo "Generating $dicttype dictionaries."
+fi
+
######################################################################
#
### echo %%% Debian or Red Hat package list
@@ -3057,6 +3134,7 @@ if test "x$show_pkglist" = "xyes" ; then
test "x$enable_chirp" = "xyes" && pkglist="$pkglist root-plugin-chirp"
test "x$enable_clarens" = "xyes" && pkglist="$pkglist root-plugin-clarens"
test "x$enable_dcache" = "xyes" && pkglist="$pkglist root-plugin-dcache"
+ test "x$enable_gfal" = "xyes" && pkglist="$pkglist root-plugin-gfal"
test "x$enable_globus" = "xyes" && pkglist="$pkglist root-plugin-globus"
test "x$enable_krb5" = "xyes" && pkglist="$pkglist root-plugin-krb5"
test "x$enable_ldap" = "xyes" && pkglist="$pkglist root-plugin-ldap"
@@ -3317,6 +3395,7 @@ sed -e "s|@aclocaldir@|$aclocaldir|" \
-e "s|@cryptolibdir@|$cryptolibdir|" \
-e "s|@dcaplib@|$dcaplib|" \
-e "s|@dcaplibdir@|$dcaplibdir|" \
+ -e "s|@dicttype@|$dicttype|" \
-e "s|@docdir@|$docdir|" \
-e "s|@elispdir@|$elispdir|" \
-e "s|@buildmathcore@|$enable_mathcore|" \
@@ -3330,6 +3409,9 @@ sed -e "s|@aclocaldir@|$aclocaldir|" \
-e "s|@etcdir@|$etcdir|" \
-e "s|@exceptions@|$enable_exceptions|" \
-e "s|@explicitlink@|$enable_explicitlink|" \
+ -e "s|@gfalincdir@|$gfalincdir|" \
+ -e "s|@gfallib@|$gfallib|" \
+ -e "s|@gfallibdir@|$gfallibdir|" \
-e "s|@globusincdir@|$globusincdir|" \
-e "s|@globuslib@|$globuslib|" \
-e "s|@globuslibdir@|$globuslibdir|" \
@@ -3431,6 +3513,7 @@ sed -e "s|@ldflags@||" \
-e "s|@buildqt@|$enable_qt|" \
-e "s|@buildshift@|$enable_rfio|" \
-e "s|@builddcap@|$enable_dcache|" \
+ -e "s|@buildgfal@|$enable_gfal|" \
-e "s|@buildchirp@|$enable_chirp|" \
-e "s|@buildalien@|$enable_alien|" \
-e "s|@buildasimage@|$enable_asimage|" \
@@ -3513,6 +3596,7 @@ sed -e "s|@architecture@|$arch|" \
-e "s|@incdir@|$incdir2|" \
-e "s|@features@|$features|" \
-e "s|@configargs@|$configargs|" \
+ -e "s|@dicttype@|$dicttype|" \
< root-config.tmp > $RCONFOUT
rm -f root-config.tmp
chmod 755 $RCONFOUT
diff --git a/cont/Module.mk b/cont/Module.mk
index 1d3ab263d91..54146650318 100644
--- a/cont/Module.mk
+++ b/cont/Module.mk
@@ -33,7 +33,7 @@ INCLUDEFILES += $(CONTDEP)
include/%.h: $(CONTDIRI)/%.h
cp $< $@
-$(CONTDS): $(CONTH) $(CONTL) $(ROOTCINTTMP)
+$(CONTDS): $(CONTH) $(CONTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(CONTH) $(CONTL)
diff --git a/dcache/Module.mk b/dcache/Module.mk
index 41de8fe2865..b3fe5d10d28 100644
--- a/dcache/Module.mk
+++ b/dcache/Module.mk
@@ -40,7 +40,7 @@ $(DCACHELIB): $(DCACHEO) $(DCACHEDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libDCache.$(SOEXT) $@ "$(DCACHEO) $(DCACHEDO)" \
"$(DCACHELIBEXTRA) $(DCAPLIBDIR) $(DCAPLIB)"
-$(DCACHEDS): $(DCACHEH) $(DCACHEL) $(ROOTCINTTMP)
+$(DCACHEDS): $(DCACHEH) $(DCACHEL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(DCACHEH) $(DCACHEL)
diff --git a/eg/Module.mk b/eg/Module.mk
index 42b0558d370..2403b6758b8 100644
--- a/eg/Module.mk
+++ b/eg/Module.mk
@@ -48,7 +48,7 @@ else
"$(EGLIBEXTRA)"
endif
-$(EGDS): $(EGH1) $(EGL) $(ROOTCINTTMP)
+$(EGDS): $(EGH1) $(EGL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(EGH1) $(EGL)
diff --git a/foam/Module.mk b/foam/Module.mk
index e6061c75abd..db193747303 100644
--- a/foam/Module.mk
+++ b/foam/Module.mk
@@ -41,7 +41,7 @@ $(FOAMLIB): $(FOAMO) $(FOAMDO) $(ORDER_) $(MAINLIBS) $(FOAMLIBDEP)
"$(SOFLAGS)" libFoam.$(SOEXT) $@ "$(FOAMO) $(FOAMDO)" \
"$(FOAMLIBEXTRA)"
-$(FOAMDS): $(FOAMH) $(FOAML) $(ROOTCINTTMP)
+$(FOAMDS): $(FOAMH) $(FOAML) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(FOAMH) $(FOAML)
diff --git a/fumili/Module.mk b/fumili/Module.mk
index 4aa4f972829..1f7ac01f09c 100644
--- a/fumili/Module.mk
+++ b/fumili/Module.mk
@@ -41,7 +41,7 @@ $(FUMILILIB): $(FUMILIO) $(FUMILIDO) $(ORDER_) $(MAINLIBS) $(FUMILILIBDEP)
"$(SOFLAGS)" libFumili.$(SOEXT) $@ "$(FUMILIO) $(FUMILIDO)" \
"$(FUMILILIBEXTRA)"
-$(FUMILIDS): $(FUMILIH) $(FUMILIL) $(ROOTCINTTMP)
+$(FUMILIDS): $(FUMILIH) $(FUMILIL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(FUMILIH) $(FUMILIL)
diff --git a/g3d/Module.mk b/g3d/Module.mk
index 686458d3b76..2517e5ffff6 100644
--- a/g3d/Module.mk
+++ b/g3d/Module.mk
@@ -46,7 +46,7 @@ $(G3DLIB): $(G3DO) $(G3DDO) $(ORDER_) $(MAINLIBS) $(G3DLIBDEP)
"$(SOFLAGS)" libGraf3d.$(SOEXT) $@ "$(G3DO) $(G3DDO)" \
"$(G3DLIBEXTRA)"
-$(G3DDS): $(G3DH1) $(G3DL) $(ROOTCINTTMP)
+$(G3DDS): $(G3DH1) $(G3DL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(G3DH1) $(G3DL)
diff --git a/ged/Module.mk b/ged/Module.mk
index e453f4d6e54..d922367cbad 100644
--- a/ged/Module.mk
+++ b/ged/Module.mk
@@ -41,7 +41,7 @@ $(GEDLIB): $(GEDO) $(GEDDO) $(ORDER_) $(MAINLIBS) $(GEDLIBDEP)
"$(SOFLAGS)" libGed.$(SOEXT) $@ "$(GEDO) $(GEDDO)" \
"$(GEDLIBEXTRA)"
-$(GEDDS): $(GEDH) $(GEDL) $(ROOTCINTTMP)
+$(GEDDS): $(GEDH) $(GEDL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GEDH) $(GEDL)
diff --git a/gedold/Module.mk b/gedold/Module.mk
index 44ab45db5ef..34d168a578f 100644
--- a/gedold/Module.mk
+++ b/gedold/Module.mk
@@ -41,7 +41,7 @@ $(GEDOLDLIB): $(GEDOLDO) $(GEDOLDDO) $(ORDER_) $(MAINLIBS) $(GEDOLDLIBDEP)
"$(SOFLAGS)" libGedOld.$(SOEXT) $@ "$(GEDOLDO) $(GEDOLDDO)" \
"$(GEDOLDLIBEXTRA)"
-$(GEDOLDDS): $(GEDOLDH) $(GEDOLDL) $(ROOTCINTTMP)
+$(GEDOLDDS): $(GEDOLDH) $(GEDOLDL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GEDOLDH) $(GEDOLDL)
diff --git a/geom/Module.mk b/geom/Module.mk
index 631e410ed72..a3b67410e27 100644
--- a/geom/Module.mk
+++ b/geom/Module.mk
@@ -60,11 +60,11 @@ $(GEOMLIB): $(GEOMO) $(GEOMDO) $(ORDER_) $(MAINLIBS) $(GEOMLIBDEP)
"$(SOFLAGS)" libGeom.$(SOEXT) $@ "$(GEOMO) $(GEOMDO)" \
"$(GEOMLIBEXTRA)"
-$(GEOMDS1): $(GEOMH1) $(GEOML1) $(ROOTCINTTMP)
+$(GEOMDS1): $(GEOMH1) $(GEOML1) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GEOMH1) $(GEOML1)
-$(GEOMDS2): $(GEOMH2) $(GEOML2) $(ROOTCINTTMP)
+$(GEOMDS2): $(GEOMH2) $(GEOML2) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GEOMH2) $(GEOML2)
diff --git a/geompainter/Module.mk b/geompainter/Module.mk
index 51092003fa6..03115e71ee1 100644
--- a/geompainter/Module.mk
+++ b/geompainter/Module.mk
@@ -44,7 +44,7 @@ $(GEOMPAINTERLIB): $(GEOMPAINTERO) $(GEOMPAINTERDO) $(ORDER_) $(MAINLIBS) \
"$(GEOMPAINTERO) $(GEOMPAINTERDO)" \
"$(GEOMPAINTERLIBEXTRA)"
-$(GEOMPAINTERDS): $(GEOMPAINTERH1) $(GEOMPAINTERL) $(ROOTCINTTMP)
+$(GEOMPAINTERDS): $(GEOMPAINTERH1) $(GEOMPAINTERL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GEOMPAINTERH1) $(GEOMPAINTERL)
diff --git a/gl/Module.mk b/gl/Module.mk
index 0a095f74a17..edfc85d1aea 100644
--- a/gl/Module.mk
+++ b/gl/Module.mk
@@ -65,7 +65,7 @@ $(GLLIB): $(GLO) $(GLO1) $(GLDO) $(ORDER_) $(MAINLIBS) $(GLLIBDEP)
"$(SOFLAGS)" libRGL.$(SOEXT) $@ "$(GLO) $(GLO1) $(GLDO)" \
"$(GLLIBEXTRA) $(GLLIBS)"
-$(GLDS): $(GLH2) $(GLL) $(ROOTCINTTMP)
+$(GLDS): $(GLH2) $(GLL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GLH2) $(GLL)
diff --git a/gpad/Module.mk b/gpad/Module.mk
index 272d2eba34d..65ff7d3fb6f 100644
--- a/gpad/Module.mk
+++ b/gpad/Module.mk
@@ -41,7 +41,7 @@ $(GPADLIB): $(GPADO) $(GPADDO) $(ORDER_) $(MAINLIBS) $(GPADLIBDEP)
"$(SOFLAGS)" libGpad.$(SOEXT) $@ "$(GPADO) $(GPADDO)" \
"$(GPADLIBEXTRA)"
-$(GPADDS): $(GPADH) $(GPADL) $(ROOTCINTTMP)
+$(GPADDS): $(GPADH) $(GPADL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GPADH) $(GPADL)
diff --git a/graf/Module.mk b/graf/Module.mk
index 041f888eaec..4a27fd80a98 100644
--- a/graf/Module.mk
+++ b/graf/Module.mk
@@ -50,10 +50,10 @@ $(GRAFLIB): $(GRAFO) $(GRAFDO) $(FREETYPEDEP) $(ORDER_) $(MAINLIBS) $(GRAFLI
"$(GRAFO) $(GRAFDO)" \
"$(FREETYPELDFLAGS) $(FREETYPELIB) $(GRAFLIBEXTRA)"
-$(GRAFDS1): $(GRAFHD) $(GRAFL1) $(ROOTCINTTMP)
+$(GRAFDS1): $(GRAFHD) $(GRAFL1) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GRAFHD) $(GRAFL1)
-$(GRAFDS2): $(GRAFH) $(GRAFL2) $(ROOTCINTTMP)
+$(GRAFDS2): $(GRAFH) $(GRAFL2) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GRAFH) $(GRAFL2)
diff --git a/gui/Module.mk b/gui/Module.mk
index efe7e6a3c6b..8a47de7c028 100644
--- a/gui/Module.mk
+++ b/gui/Module.mk
@@ -75,13 +75,13 @@ $(GUILIB): $(GUIO) $(GUIDO) $(ORDER_) $(MAINLIBS) $(GUILIBDEP)
"$(SOFLAGS)" libGui.$(SOEXT) $@ "$(GUIO) $(GUIDO)" \
"$(GUILIBEXTRA)"
-$(GUIDS1): $(GUIH1) $(GUIL1) $(ROOTCINTTMP)
+$(GUIDS1): $(GUIH1) $(GUIL1) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GUIH1) $(GUIL1)
-$(GUIDS2): $(GUIH2) $(GUIL2) $(ROOTCINTTMP)
+$(GUIDS2): $(GUIH2) $(GUIL2) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GUIH2) $(GUIL2)
-$(GUIDS3): $(GUIH3) $(GUIL3) $(ROOTCINTTMP)
+$(GUIDS3): $(GUIH3) $(GUIL3) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GUIH3) $(GUIL3)
diff --git a/guibuilder/Module.mk b/guibuilder/Module.mk
index 2dd095d44c3..c177dd7c0e4 100644
--- a/guibuilder/Module.mk
+++ b/guibuilder/Module.mk
@@ -41,7 +41,7 @@ $(GUIBLDLIB): $(GUIBLDO) $(GUIBLDDO) $(ORDER_) $(MAINLIBS) $(GUIBLDLIBDEP)
"$(SOFLAGS)" libGuiBld.$(SOEXT) $@ "$(GUIBLDO) $(GUIBLDDO)" \
"$(GUIBLDLIBEXTRA)"
-$(GUIBLDDS): $(GUIBLDH) $(GUIBLDL) $(ROOTCINTTMP)
+$(GUIBLDDS): $(GUIBLDH) $(GUIBLDL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GUIBLDH) $(GUIBLDL)
diff --git a/hbook/Module.mk b/hbook/Module.mk
index b3e498c47b1..d3fbb856478 100644
--- a/hbook/Module.mk
+++ b/hbook/Module.mk
@@ -45,7 +45,7 @@ $(HBOOKLIB): $(HBOOKO) $(HBOOKDO) $(ORDER_) $(MAINLIBS) $(HBOOKLIBDEP)
"$(HBOOKO2) $(CERNLIBDIR) $(CERNLIBS) $(RFIOLIBEXTRA) \
$(SHIFTLIBDIR) $(SHIFTLIB) $(HBOOKLIBEXTRA) $(F77LIBS)"
-$(HBOOKDS): $(HBOOKH) $(HBOOKL) $(ROOTCINTTMP)
+$(HBOOKDS): $(HBOOKH) $(HBOOKL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(HBOOKH) $(HBOOKL)
diff --git a/hist/Module.mk b/hist/Module.mk
index 48dc7053c46..3f512b16622 100644
--- a/hist/Module.mk
+++ b/hist/Module.mk
@@ -41,7 +41,7 @@ $(HISTLIB): $(HISTO) $(HISTDO) $(ORDER_) $(MAINLIBS) $(HISTLIBDEP)
"$(SOFLAGS)" libHist.$(SOEXT) $@ "$(HISTO) $(HISTDO)" \
"$(HISTLIBEXTRA)"
-$(HISTDS): $(HISTH) $(HISTL) $(ROOTCINTTMP)
+$(HISTDS): $(HISTH) $(HISTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(HISTH) $(HISTL)
diff --git a/histpainter/Module.mk b/histpainter/Module.mk
index e26ca980a07..aaf591566f1 100644
--- a/histpainter/Module.mk
+++ b/histpainter/Module.mk
@@ -44,7 +44,7 @@ $(HISTPAINTERLIB): $(HISTPAINTERO) $(HISTPAINTERDO) $(ORDER_) $(MAINLIBS) \
"$(HISTPAINTERO) $(HISTPAINTERDO)" \
"$(HISTPAINTERLIBEXTRA)"
-$(HISTPAINTERDS): $(HISTPAINTERH1) $(HISTPAINTERL) $(ROOTCINTTMP)
+$(HISTPAINTERDS): $(HISTPAINTERH1) $(HISTPAINTERL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(HISTPAINTERH1) $(HISTPAINTERL)
diff --git a/html/Module.mk b/html/Module.mk
index ee3ba6a5f63..09d16a5a8e6 100644
--- a/html/Module.mk
+++ b/html/Module.mk
@@ -41,7 +41,7 @@ $(HTMLLIB): $(HTMLO) $(HTMLDO) $(ORDER_) $(MAINLIBS) $(HTMLLIBDEP)
"$(SOFLAGS)" libHtml.$(SOEXT) $@ "$(HTMLO) $(HTMLDO)" \
"$(HTMLLIBEXTRA)"
-$(HTMLDS): $(HTMLH) $(HTMLL) $(ROOTCINTTMP)
+$(HTMLDS): $(HTMLH) $(HTMLL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(HTMLH) $(HTMLL)
diff --git a/krb5auth/Module.mk b/krb5auth/Module.mk
index 55acdcc274e..e528269035c 100644
--- a/krb5auth/Module.mk
+++ b/krb5auth/Module.mk
@@ -46,7 +46,7 @@ $(KRB5AUTHLIB): $(KRB5AUTHO) $(KRB5AUTHDO) $(ORDER_) $(MAINLIBS) $(KRB5AUTHLIBDE
$(COMERRLIBDIR) $(COMERRLIB) $(RESOLVLIB) \
$(CRYPTOLIBDIR) $(CRYPTOLIB) $(KRB5AUTHLIBEXTRA)"
-$(KRB5AUTHDS): $(KRB5AUTHH1) $(KRB5AUTHL) $(ROOTCINTTMP)
+$(KRB5AUTHDS): $(KRB5AUTHH1) $(KRB5AUTHL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(KRB5AUTHH1) $(KRB5AUTHL)
diff --git a/ldap/Module.mk b/ldap/Module.mk
index db4f6a8e50c..3b6a4ac663d 100644
--- a/ldap/Module.mk
+++ b/ldap/Module.mk
@@ -41,7 +41,7 @@ $(LDAPLIB): $(LDAPO) $(LDAPDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libRLDAP.$(SOEXT) $@ "$(LDAPO) $(LDAPDO)" \
"$(LDAPLIBEXTRA) $(LDAPLIBDIR) $(LDAPCLILIB)"
-$(LDAPDS): $(LDAPH) $(LDAPL) $(ROOTCINTTMP)
+$(LDAPDS): $(LDAPH) $(LDAPL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(LDAPH) $(LDAPL)
diff --git a/mathcore/Module.mk b/mathcore/Module.mk
index 6f93cd3590c..5b5d2e30d71 100644
--- a/mathcore/Module.mk
+++ b/mathcore/Module.mk
@@ -77,7 +77,7 @@ $(MATHCORELIB): $(MATHCOREO) $(MATHCOREDO) $(ORDER_) $(MAINLIBS)
"$(MATHCOREO) $(MATHCOREDO)" \
"$(MATHCORELIBEXTRA)"
-$(MATHCOREDS): $(MATHCOREDH1) $(MATHCOREL) $(MATHCORELINC) $(ROOTCINTTMP)
+$(MATHCOREDS): $(MATHCOREDH1) $(MATHCOREL) $(MATHCORELINC) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
@echo "for files $(MATHCOREDH1)"
$(ROOTCINTTMP) -f $@ -c $(MATHCOREDH1) $(MATHCOREL)
diff --git a/mathmore/Module.mk b/mathmore/Module.mk
index 5cb1dcff094..9707b1d2564 100644
--- a/mathmore/Module.mk
+++ b/mathmore/Module.mk
@@ -145,7 +145,7 @@ $(MATHMORELIB): $(GSLDEP) $(MATHMOREO) $(MATHMOREDO) $(ORDER_) $(MAINLIBS)
"$(MATHMOREO) $(MATHMOREDO)" \
"$(MATHMORELIBEXTRA) $(GSLLIBA)"
-$(MATHMOREDS): $(MATHMOREDH1) $(MATHMOREL) $(MATHMORELINC) $(ROOTCINTTMP)
+$(MATHMOREDS): $(MATHMOREDH1) $(MATHMOREL) $(MATHMORELINC) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(MATHMOREDH1) $(MATHMOREL)
diff --git a/matrix/Module.mk b/matrix/Module.mk
index 7436c8c86b8..87144c674e2 100644
--- a/matrix/Module.mk
+++ b/matrix/Module.mk
@@ -41,7 +41,7 @@ $(MATRIXLIB): $(MATRIXO) $(MATRIXDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libMatrix.$(SOEXT) $@ "$(MATRIXO) $(MATRIXDO)" \
"$(MATRIXLIBEXTRA)"
-$(MATRIXDS): $(MATRIXH) $(MATRIXL) $(ROOTCINTTMP)
+$(MATRIXDS): $(MATRIXH) $(MATRIXL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(MATRIXH) $(MATRIXL)
diff --git a/meta/Module.mk b/meta/Module.mk
index 0c9cf4253d9..b04d68a7fdc 100644
--- a/meta/Module.mk
+++ b/meta/Module.mk
@@ -33,7 +33,7 @@ INCLUDEFILES += $(METADEP)
include/%.h: $(METADIRI)/%.h
cp $< $@
-$(METADS): $(METAH) $(METAL) $(ROOTCINTTMP)
+$(METADS): $(METAH) $(METAL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c -DG__API $(METAH) $(METAL)
diff --git a/minuit/Module.mk b/minuit/Module.mk
index 09dbc9ce6b4..f89bf590aaf 100644
--- a/minuit/Module.mk
+++ b/minuit/Module.mk
@@ -41,7 +41,7 @@ $(MINUITLIB): $(MINUITO) $(MINUITDO) $(ORDER_) $(MAINLIBS) $(MINUITLIBDEP)
"$(SOFLAGS)" libMinuit.$(SOEXT) $@ "$(MINUITO) $(MINUITDO)" \
"$(MINUITLIBEXTRA)"
-$(MINUITDS): $(MINUITH) $(MINUITL) $(ROOTCINTTMP)
+$(MINUITDS): $(MINUITH) $(MINUITL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(MINUITH) $(MINUITL)
diff --git a/minuit2/Module.mk b/minuit2/Module.mk
index b2e20fbc3c8..acfae077a7a 100644
--- a/minuit2/Module.mk
+++ b/minuit2/Module.mk
@@ -72,7 +72,7 @@ $(MINUIT2LIB): $(MINUIT2O) $(MINUIT2DO) $(ORDER_) $(MAINLIBS) $(MINUIT2LIBDEP)
"$(MINUIT2O) $(MINUIT2DO)" \
"$(MINUIT2LIBEXTRA)"
-$(MINUIT2DS): $(MINUIT2H) $(MINUIT2L) $(ROOTCINTTMP)
+$(MINUIT2DS): $(MINUIT2H) $(MINUIT2L) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(MINUIT2H) $(MINUIT2L)
diff --git a/mlp/Module.mk b/mlp/Module.mk
index 7beed878147..7af45413233 100644
--- a/mlp/Module.mk
+++ b/mlp/Module.mk
@@ -41,7 +41,7 @@ $(MLPLIB): $(MLPO) $(MLPDO) $(ORDER_) $(MAINLIBS) $(MLPLIBDEP)
"$(SOFLAGS)" libMLP.$(SOEXT) $@ "$(MLPO) $(MLPDO)" \
"$(MLPLIBEXTRA)"
-$(MLPDS): $(MLPH) $(MLPL) $(ROOTCINTTMP)
+$(MLPDS): $(MLPH) $(MLPL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(MLPH) $(MLPL)
diff --git a/mysql/Module.mk b/mysql/Module.mk
index 2f61a299aa2..b6341a1ee2e 100644
--- a/mysql/Module.mk
+++ b/mysql/Module.mk
@@ -41,7 +41,7 @@ $(MYSQLLIB): $(MYSQLO) $(MYSQLDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libMySQL.$(SOEXT) $@ "$(MYSQLO) $(MYSQLDO)" \
"$(MYSQLLIBEXTRA) $(MYSQLLIBDIR) $(MYSQLCLILIB)"
-$(MYSQLDS): $(MYSQLH) $(MYSQLL) $(ROOTCINTTMP)
+$(MYSQLDS): $(MYSQLH) $(MYSQLL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(MYSQLH) $(MYSQLL)
diff --git a/net/Module.mk b/net/Module.mk
index cd55437811c..21d5db68d47 100644
--- a/net/Module.mk
+++ b/net/Module.mk
@@ -36,7 +36,7 @@ INCLUDEFILES += $(NETDEP)
include/%.h: $(NETDIRI)/%.h
cp $< $@
-$(NETDS): $(NETH) $(NETL) $(ROOTCINTTMP)
+$(NETDS): $(NETH) $(NETL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(NETH) $(NETL)
diff --git a/netx/Module.mk b/netx/Module.mk
index e0eef1ff141..6fd5919f7e2 100644
--- a/netx/Module.mk
+++ b/netx/Module.mk
@@ -61,7 +61,7 @@ $(NETXLIB): $(NETXO) $(NETXDO) $(XRDPLUGINS) $(ORDER_) $(MAINLIBS) $(NETXLIB
"$(SOFLAGS)" libNetx.$(SOEXT) $@ "$(NETXO) $(NETXDO)" \
"$(NETXLIBEXTRA)"
-$(NETXDS): $(NETXH1) $(NETXL) $(ROOTCINTTMP) $(XROOTDETAG)
+$(NETXDS): $(NETXH1) $(NETXL) $(ROOTCINTTMPEXE) $(XROOTDETAG)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(NETXINCEXTRA) $(NETXH) $(NETXL)
diff --git a/oracle/Module.mk b/oracle/Module.mk
index 72d6d280ac4..de8c5c42053 100644
--- a/oracle/Module.mk
+++ b/oracle/Module.mk
@@ -41,7 +41,7 @@ $(ORACLELIB): $(ORACLEO) $(ORACLEDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libOracle.$(SOEXT) $@ "$(ORACLEO) $(ORACLEDO)" \
"$(ORACLELIBEXTRA) $(ORACLELIBDIR) $(ORACLECLILIB)"
-$(ORACLEDS): $(ORACLEH) $(ORACLEL) $(ROOTCINTTMP)
+$(ORACLEDS): $(ORACLEH) $(ORACLEL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(ORACLEH) $(ORACLEL)
diff --git a/peac/Module.mk b/peac/Module.mk
index e440c0c2fb6..f1fbfac958b 100644
--- a/peac/Module.mk
+++ b/peac/Module.mk
@@ -62,7 +62,7 @@ $(PEACLIB): $(PEACO) $(PEACDO) $(ORDER_) $(MAINLIBS) $(PEACLIBDEP)
"$(SOFLAGS)" libPeac.$(SOEXT) $@ "$(PEACO) $(PEACDO)" \
"$(PEACLIBEXTRA)"
-$(PEACDS): $(PEACH) $(PEACL) $(ROOTCINTTMP)
+$(PEACDS): $(PEACH) $(PEACL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(PEACH) $(PEACL)
@@ -75,7 +75,7 @@ $(PEACGUILIB): $(PEACGUIO) $(PEACGUIDO) $(ORDER_) $(MAINLIBS) $(PEACGUILIBDEP)
"$(PEACGUIO) $(PEACGUIDO)" \
"$(PEACGUILIBEXTRA)"
-$(PEACGUIDS): $(PEACGUIH) $(PEACGUIL) $(ROOTCINTTMP)
+$(PEACGUIDS): $(PEACGUIH) $(PEACGUIL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(PEACGUIH) $(PEACGUIL)
diff --git a/pgsql/Module.mk b/pgsql/Module.mk
index c4d76b12e0f..d021d42fc2d 100644
--- a/pgsql/Module.mk
+++ b/pgsql/Module.mk
@@ -41,7 +41,7 @@ $(PGSQLLIB): $(PGSQLO) $(PGSQLDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libPgSQL.$(SOEXT) $@ "$(PGSQLO) $(PGSQLDO)" \
"$(PGSQLLIBEXTRA) $(PGSQLLIBDIR) $(PGSQLCLILIB)"
-$(PGSQLDS): $(PGSQLH) $(PGSQLL) $(ROOTCINTTMP)
+$(PGSQLDS): $(PGSQLH) $(PGSQLL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(PGSQLH) $(PGSQLL)
diff --git a/physics/Module.mk b/physics/Module.mk
index 0f747b06329..6baf7946983 100644
--- a/physics/Module.mk
+++ b/physics/Module.mk
@@ -41,7 +41,7 @@ $(PHYSICSLIB): $(PHYSICSO) $(PHYSICSDO) $(ORDER_) $(MAINLIBS) $(PHYSICSLIBDEP)
"$(SOFLAGS)" libPhysics.$(SOEXT) $@ \
"$(PHYSICSO) $(PHYSICSDO)" "$(PHYSICSLIBEXTRA)"
-$(PHYSICSDS): $(PHYSICSH) $(PHYSICSL) $(ROOTCINTTMP)
+$(PHYSICSDS): $(PHYSICSH) $(PHYSICSL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(PHYSICSH) $(PHYSICSL)
diff --git a/postscript/Module.mk b/postscript/Module.mk
index a364556b3aa..9b2022eab83 100644
--- a/postscript/Module.mk
+++ b/postscript/Module.mk
@@ -42,7 +42,7 @@ $(POSTSCRIPTLIB): $(POSTSCRIPTO) $(POSTSCRIPTDO) $(ORDER_) $(MAINLIBS) $(POSTSCR
"$(POSTSCRIPTO) $(POSTSCRIPTDO)" \
"$(POSTSCRIPTLIBEXTRA)"
-$(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMP)
+$(POSTSCRIPTDS): $(POSTSCRIPTH) $(POSTSCRIPTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(POSTSCRIPTH) $(POSTSCRIPTL)
diff --git a/proof/Module.mk b/proof/Module.mk
index 3864415cad3..47a4bbf9150 100644
--- a/proof/Module.mk
+++ b/proof/Module.mk
@@ -62,7 +62,7 @@ $(PROOFLIB): $(PROOFO) $(PROOFDO) $(ORDER_) $(MAINLIBS) $(PROOFLIBDEP)
"$(SOFLAGS)" libProof.$(SOEXT) $@ "$(PROOFO) $(PROOFDO)" \
"$(PROOFLIBEXTRA)"
-$(PROOFDS): $(PROOFH) $(PROOFL) $(ROOTCINTTMP)
+$(PROOFDS): $(PROOFH) $(PROOFL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(PROOFH) $(PROOFL)
@@ -75,7 +75,7 @@ $(PROOFGUILIB): $(PROOFGUIO) $(PROOFGUIDO) $(ORDER_) $(MAINLIBS) $(PROOFGUILIBDE
"$(PROOFGUIO) $(PROOFGUIDO)" \
"$(PROOFGUILIBEXTRA)"
-$(PROOFGUIDS): $(PROOFGUIH) $(PROOFGUIL) $(ROOTCINTTMP)
+$(PROOFGUIDS): $(PROOFGUIH) $(PROOFGUIL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(PROOFGUIH) $(PROOFGUIL)
diff --git a/pyroot/Module.mk b/pyroot/Module.mk
index 79911785d79..c42d5599d9b 100644
--- a/pyroot/Module.mk
+++ b/pyroot/Module.mk
@@ -59,7 +59,7 @@ $(PYROOTLIB): $(PYROOTO) $(PYROOTDO) $(ROOTLIBSDEP) $(ROOTPY) $(ROOTPYC) \
$(PYTHONLIBDIR) $(PYTHONLIB) \
$(OSTHREADLIBDIR) $(OSTHREADLIB)" "$(PYTHONLIBFLAGS)"
-$(PYROOTDS): $(PYROOTH) $(PYROOTL) $(ROOTCINTTMP)
+$(PYROOTDS): $(PYROOTH) $(PYROOTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(PYROOTH) $(PYROOTL)
diff --git a/pythia/Module.mk b/pythia/Module.mk
index 8622cfbcb8e..1271bf9a12f 100644
--- a/pythia/Module.mk
+++ b/pythia/Module.mk
@@ -43,7 +43,7 @@ $(PYTHIALIB): $(PYTHIAO) $(PYTHIADO) $(ORDER_) $(MAINLIBS) $(PYTHIALIBDEP)
"$(PYTHIAO) $(PYTHIADO)" \
"$(PYTHIALIBEXTRA) $(FPYTHIALIBDIR) $(FPYTHIALIB)"
-$(PYTHIADS): $(PYTHIAH1) $(PYTHIAL) $(ROOTCINTTMP)
+$(PYTHIADS): $(PYTHIAH1) $(PYTHIAL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(PYTHIAH1) $(PYTHIAL)
diff --git a/pythia6/Module.mk b/pythia6/Module.mk
index 33dbea9da3d..80760a32bc1 100644
--- a/pythia6/Module.mk
+++ b/pythia6/Module.mk
@@ -42,7 +42,7 @@ $(PYTHIA6LIB): $(PYTHIA6O) $(PYTHIA6DO) $(ORDER_) $(MAINLIBS) $(PYTHIA6LIBDEP)
"$(PYTHIA6O) $(PYTHIA6DO)" \
"$(PYTHIA6LIBEXTRA) $(FPYTHIA6LIBDIR) $(FPYTHIA6LIB)"
-$(PYTHIA6DS): $(PYTHIA6H) $(PYTHIA6L) $(ROOTCINTTMP)
+$(PYTHIA6DS): $(PYTHIA6H) $(PYTHIA6L) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(PYTHIA6H) $(PYTHIA6L)
diff --git a/qt/Module.mk b/qt/Module.mk
index 5a4b797a710..685912d5265 100644
--- a/qt/Module.mk
+++ b/qt/Module.mk
@@ -68,7 +68,7 @@ $(GQTLIB): $(GQTO) $(GQTDO) $(GQTMOCO) $(ORDER_) $(MAINLIBS) $(GQTLIBDEP)
"$(GQTO) $(GQTMOCO) $(GQTDO)" \
"$(GQTLIBEXTRA) $(QTLIBDIR) $(QTLIB)"
-$(GQTDS): $(GQTH1) $(GQTL) $(ROOTCINTTMP)
+$(GQTDS): $(GQTH1) $(GQTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GQTH1) $(GQTL)
diff --git a/qtroot/Module.mk b/qtroot/Module.mk
index 272f203c5f5..2a5e47a3547 100644
--- a/qtroot/Module.mk
+++ b/qtroot/Module.mk
@@ -41,7 +41,7 @@ $(QTROOTLIB): $(QTROOTO) $(QTROOTDO) $(ORDER_) $(MAINLIBS) $(QTROOTLIBDEP)
"$(SOFLAGS)" libQtRoot.$(SOEXT) $@ "$(QTROOTO) $(QTROOTDO)" \
"$(QTROOTLIBEXTRA) $(QTLIBDIR) $(QTLIB)"
-$(QTROOTDS): $(QTROOTH) $(QTROOTL) $(ROOTCINTTMP)
+$(QTROOTDS): $(QTROOTH) $(QTROOTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(QTROOTH) $(QTROOTL)
diff --git a/quadp/Module.mk b/quadp/Module.mk
index 5f322001055..88ef449520d 100644
--- a/quadp/Module.mk
+++ b/quadp/Module.mk
@@ -41,7 +41,7 @@ $(QUADPLIB): $(QUADPO) $(QUADPDO) $(ORDER_) $(MAINLIBS) $(QUADPLIBDEP)
"$(SOFLAGS)" libQuadp.$(SOEXT) $@ "$(QUADPO) $(QUADPDO)" \
"$(QUADPLIBEXTRA)"
-$(QUADPDS): $(QUADPH) $(QUADPL) $(ROOTCINTTMP)
+$(QUADPDS): $(QUADPH) $(QUADPL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(QUADPH) $(QUADPL)
diff --git a/rfio/Module.mk b/rfio/Module.mk
index 0f96d9cb603..c5f0a43088e 100644
--- a/rfio/Module.mk
+++ b/rfio/Module.mk
@@ -41,7 +41,7 @@ $(RFIOLIB): $(RFIOO) $(RFIODO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libRFIO.$(SOEXT) $@ "$(RFIOO) $(RFIODO)" \
"$(RFIOLIBEXTRA) $(SHIFTLIBDIR) $(SHIFTLIB)"
-$(RFIODS): $(RFIOH) $(RFIOL) $(ROOTCINTTMP)
+$(RFIODS): $(RFIOH) $(RFIOL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(RFIOH) $(RFIOL)
diff --git a/rint/Module.mk b/rint/Module.mk
index 56aac692435..1073da3fd95 100644
--- a/rint/Module.mk
+++ b/rint/Module.mk
@@ -41,7 +41,7 @@ $(RINTLIB): $(RINTO) $(RINTDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libRint.$(SOEXT) $@ "$(RINTO) $(RINTDO)" \
"$(RINTLIBEXTRA)"
-$(RINTDS): $(RINTH) $(RINTL) $(ROOTCINTTMP)
+$(RINTDS): $(RINTH) $(RINTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(RINTH) $(RINTL)
diff --git a/roofit/Module.mk b/roofit/Module.mk
index 88d973111e9..45f7284bc91 100644
--- a/roofit/Module.mk
+++ b/roofit/Module.mk
@@ -95,7 +95,7 @@ $(ROOFITETAG): $(ROOFITSRCS)
touch $$etag ; \
fi)
-$(ROOFITH): $(ROOFITETAG)
+$(ROOFITH) $(ROOFITL1) $(ROOFITL2) $(ROOFITL3): $(ROOFITETAG)
# Use static rule here instead of implicit rule
$(ROOFITINCH): include/%.h: $(ROOFITDIRI)/%.h
@@ -106,15 +106,15 @@ $(ROOFITLIB): $(ROOFITO) $(ROOFITDO) $(ORDER_) $(MAINLIBS) $(ROOFITLIBDEP)
"$(SOFLAGS)" libRooFit.$(SOEXT) $@ "$(ROOFITO) $(ROOFITDO)" \
"$(ROOFITLIBEXTRA)"
-$(ROOFITDS1): $(ROOFITETAG) $(ROOFITH1) $(ROOFITL1) $(ROOTCINTTMP)
+$(ROOFITDS1): $(ROOFITETAG) $(ROOFITH1) $(ROOFITL1) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(ROOFITH1) $(ROOFITL1)
-$(ROOFITDS2): $(ROOFITETAG) $(ROOFITH2) $(ROOFITL2) $(ROOTCINTTMP)
+$(ROOFITDS2): $(ROOFITETAG) $(ROOFITH2) $(ROOFITL2) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(ROOFITH2) $(ROOFITL2)
-$(ROOFITDS3): $(ROOFITETAG) $(ROOFITH3) $(ROOFITL3) $(ROOTCINTTMP)
+$(ROOFITDS3): $(ROOFITETAG) $(ROOFITH3) $(ROOFITL3) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(ROOFITH3) $(ROOFITL3)
diff --git a/ruby/Module.mk b/ruby/Module.mk
index 9631952036b..5168a4cd369 100644
--- a/ruby/Module.mk
+++ b/ruby/Module.mk
@@ -42,7 +42,7 @@ $(RUBYROOTLIB): $(RUBYROOTO) $(RUBYROOTDO) $(ORDER_) $(MAINLIBS) $(RUBYLIBDEP)
"$(RUBYROOTO) $(RUBYROOTDO)" \
"$(RUBYLIBDIR) $(RUBYLIB) $(RUBYLIBEXTRA) $(CRYPTLIBS)"
-$(RUBYROOTDS): $(RUBYROOTH) $(RUBYROOTL) $(ROOTCINTTMP)
+$(RUBYROOTDS): $(RUBYROOTH) $(RUBYROOTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(RUBYROOTH) $(RUBYROOTL)
diff --git a/sapdb/Module.mk b/sapdb/Module.mk
index 5f321cf491e..145f4d5f187 100644
--- a/sapdb/Module.mk
+++ b/sapdb/Module.mk
@@ -41,7 +41,7 @@ $(SAPDBLIB): $(SAPDBO) $(SAPDBDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libSapDB.$(SOEXT) $@ "$(SAPDBO) $(SAPDBDO)" \
"$(SAPDBLIBEXTRA) $(SAPDBLIBDIR) $(SAPDBCLILIB)"
-$(SAPDBDS): $(SAPDBH) $(SAPDBL) $(ROOTCINTTMP)
+$(SAPDBDS): $(SAPDBH) $(SAPDBL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(SAPDBH) $(SAPDBL)
diff --git a/smatrix/Module.mk b/smatrix/Module.mk
index dc9e3c8f4f5..bb8642ce56f 100644
--- a/smatrix/Module.mk
+++ b/smatrix/Module.mk
@@ -60,7 +60,7 @@ $(SMATRIXLIB): $(SMATRIXO) $(SMATRIXDO) $(ORDER_) $(MAINLIBS)
"$(SMATRIXLIBEXTRA)"
-$(SMATRIXDS): $(SMATRIXDH1) $(SMATRIXL) $(SMATRIXLINC) $(ROOTCINTTMP)
+$(SMATRIXDS): $(SMATRIXDH1) $(SMATRIXL) $(SMATRIXLINC) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
@echo "for files $(SMATRIXDH1)"
$(ROOTCINTTMP) -f $@ -c $(SMATRIXDH1) $(SMATRIXL)
diff --git a/splot/Module.mk b/splot/Module.mk
index 80d255134b2..2a4c65ff8ff 100644
--- a/splot/Module.mk
+++ b/splot/Module.mk
@@ -41,7 +41,7 @@ $(SPLOTLIB): $(SPLOTO) $(SPLOTDO) $(ORDER_) $(MAINLIBS) $(SPLOTLIBDEP)
"$(SOFLAGS)" libSPlot.$(SOEXT) $@ "$(SPLOTO) $(SPLOTDO)" \
"$(SPLOTLIBEXTRA)"
-$(SPLOTDS): $(SPLOTH) $(SPLOTL) $(ROOTCINTTMP)
+$(SPLOTDS): $(SPLOTH) $(SPLOTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(SPLOTH) $(SPLOTL)
diff --git a/sql/Module.mk b/sql/Module.mk
index d32e71da1bc..dbe2e3f8f85 100644
--- a/sql/Module.mk
+++ b/sql/Module.mk
@@ -41,7 +41,7 @@ $(SQLLIB): $(SQLO) $(SQLDO) $(ORDER_) $(MAINLIBS) $(SQLLIBDEP)
"$(SOFLAGS)" libSQL.$(SOEXT) $@ "$(SQLO) $(SQLDO)" \
"$(SQLLIBEXTRA)"
-$(SQLDS): $(SQLH) $(SQLL) $(ROOTCINTTMP)
+$(SQLDS): $(SQLH) $(SQLL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(SQLH) $(SQLL)
diff --git a/table/Module.mk b/table/Module.mk
index a299591b249..ae043ca091f 100644
--- a/table/Module.mk
+++ b/table/Module.mk
@@ -41,7 +41,7 @@ $(TABLELIB): $(TABLEO) $(TABLEDO) $(ORDER_) $(MAINLIBS) $(TABLELIBDEP)
"$(SOFLAGS)" libTable.$(SOEXT) $@ "$(TABLEO) $(TABLEDO)" \
"$(TABLELIBEXTRA)"
-$(TABLEDS): $(TABLEH) $(TABLEL) $(ROOTCINTTMP)
+$(TABLEDS): $(TABLEH) $(TABLEL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(TABLEH) $(TABLEL)
diff --git a/thread/Module.mk b/thread/Module.mk
index 37c9f657b29..285c7223acc 100644
--- a/thread/Module.mk
+++ b/thread/Module.mk
@@ -75,7 +75,7 @@ $(THREADLIB): $(THREADO) $(THREADDO) $(ORDER_) $(MAINLIBS) $(THREADLIBDEP)
"$(SOFLAGS)" libThread.$(SOEXT) $@ "$(THREADO) $(THREADDO)" \
"$(THREADLIBEXTRA) $(OSTHREADLIBDIR) $(OSTHREADLIB)"
-$(THREADDS): $(THREADH) $(THREADL) $(ROOTCINTTMP)
+$(THREADDS): $(THREADH) $(THREADL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(THREADH) $(THREADL)
diff --git a/tree/Module.mk b/tree/Module.mk
index 658d54d1617..157fb893d9a 100644
--- a/tree/Module.mk
+++ b/tree/Module.mk
@@ -48,7 +48,7 @@ $(TREELIB): $(TREEO) $(TREEDO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libTree.$(SOEXT) $@ "$(TREEO) $(TREEDO)" \
"$(TREELIBEXTRA)"
-$(TREEDS): $(TREEH) $(TREEL) $(ROOTCINTTMP)
+$(TREEDS): $(TREEH) $(TREEL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(TREEH) $(TREEL)
diff --git a/treeplayer/Module.mk b/treeplayer/Module.mk
index c3c00ef7ce5..5fa3593c908 100644
--- a/treeplayer/Module.mk
+++ b/treeplayer/Module.mk
@@ -43,7 +43,7 @@ $(TREEPLAYERLIB): $(TREEPLAYERO) $(TREEPLAYERDO) $(ORDER_) $(MAINLIBS) \
"$(TREEPLAYERO) $(TREEPLAYERDO)" \
"$(TREEPLAYERLIBEXTRA)"
-$(TREEPLAYERDS): $(TREEPLAYERH) $(TREEPLAYERL) $(ROOTCINTTMP)
+$(TREEPLAYERDS): $(TREEPLAYERH) $(TREEPLAYERL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(TREEPLAYERH) $(TREEPLAYERL)
diff --git a/treeviewer/Module.mk b/treeviewer/Module.mk
index f1b7e36ee0c..64a3f8898c5 100644
--- a/treeviewer/Module.mk
+++ b/treeviewer/Module.mk
@@ -56,7 +56,7 @@ $(TREEVIEWERLIB): $(TREEVIEWERO) $(TREEVIEWERDO) $(ORDER_) $(MAINLIBS) \
"$(TREEVIEWERO) $(TREEVIEWERDO)" \
"$(TREEVIEWERLIBEXTRA)"
-$(TREEVIEWERDS): $(TREEVIEWERH) $(TREEVIEWERL) $(ROOTCINTTMP)
+$(TREEVIEWERDS): $(TREEVIEWERH) $(TREEVIEWERL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(TREEVIEWERH) $(TREEVIEWERL)
diff --git a/unix/Module.mk b/unix/Module.mk
index 9134bb2eda5..cf5c9c6c818 100644
--- a/unix/Module.mk
+++ b/unix/Module.mk
@@ -33,7 +33,7 @@ INCLUDEFILES += $(UNIXDEP)
include/%.h: $(UNIXDIRI)/%.h
cp $< $@
-$(UNIXDS): $(UNIXH) $(UNIXL) $(ROOTCINTTMP)
+$(UNIXDS): $(UNIXH) $(UNIXL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(UNIXH) $(UNIXL)
diff --git a/utils/Module.mk b/utils/Module.mk
index 4c9225a5a80..ebf5d0a4d72 100644
--- a/utils/Module.mk
+++ b/utils/Module.mk
@@ -16,8 +16,8 @@ ROOTCINTS := $(MODDIRS)/rootcint.cxx $(wildcard $(MODDIRS)/R*.cxx)
ROOTCINTO := $(ROOTCINTS:.cxx=.o)
ROOTCINTDEP := $(ROOTCINTO:.o=.d)
ROOTCINTTMPO := $(ROOTCINTS:.cxx=_tmp.o)
-ROOTCINTTMP := $(MODDIRS)/rootcint_tmp$(EXEEXT)
-ROOTCINT := bin/rootcint$(EXEEXT)
+ROOTCINTTMPEXE:= $(MODDIRS)/rootcint_tmp$(EXEEXT)
+ROOTCINTEXE := bin/rootcint$(EXEEXT)
##### rlibmap #####
RLIBMAPS := $(MODDIRS)/rlibmap.cxx
@@ -29,11 +29,11 @@ RLIBMAP := bin/rlibmap$(EXEEXT)
INCLUDEFILES += $(ROOTCINTDEP) $(RLIBMAPDEP)
##### local rules #####
-$(ROOTCINT): $(CINTLIB) $(ROOTCINTO) $(METAUTILSO) $(MAKEINFO) $(IOSENUM)
+$(ROOTCINTEXE): $(CINTLIB) $(ROOTCINTO) $(METAUTILSO) $(MAKEINFO) $(IOSENUM)
$(LD) $(LDFLAGS) -o $@ $(ROOTCINTO) $(METAUTILSO) \
$(RPATH) $(CINTLIBS) $(CILIBS)
-$(ROOTCINTTMP): $(CINTTMPO) $(ROOTCINTTMPO) $(METAUTILSO) $(MAKEINFO) $(IOSENUM)
+$(ROOTCINTTMPEXE): $(CINTTMPO) $(ROOTCINTTMPO) $(METAUTILSO) $(MAKEINFO) $(IOSENUM)
$(LD) $(LDFLAGS) -o $@ \
$(ROOTCINTTMPO) $(METAUTILSO) $(CINTTMPO) $(CILIBS)
@@ -44,7 +44,7 @@ else
$(LD) $(LDFLAGS) -o $@ $< imagehlp.lib
endif
-all-utils: $(ROOTCINTTMP) $(ROOTCINT) $(RLIBMAP)
+all-utils: $(ROOTCINTTMPEXE) $(ROOTCINTEXE) $(RLIBMAP)
clean-utils:
@rm -f $(ROOTCINTTMPO) $(ROOTCINTO) $(RLIBMAPO)
@@ -52,7 +52,7 @@ clean-utils:
clean:: clean-utils
distclean-utils: clean-utils
- @rm -f $(ROOTCINTDEP) $(ROOTCINTTMP) $(ROOTCINT) \
+ @rm -f $(ROOTCINTDEP) $(ROOTCINTTMPEXE) $(ROOTCINTEXE) \
$(RLIBMAPDEP) $(RLIBMAP) \
$(UTILSDIRS)/*.exp $(UTILSDIRS)/*.lib
diff --git a/venus/Module.mk b/venus/Module.mk
index e5e8179ccc2..564219b3598 100644
--- a/venus/Module.mk
+++ b/venus/Module.mk
@@ -43,7 +43,7 @@ $(VENUSLIB): $(VENUSO) $(VENUSDO) $(ORDER_) $(MAINLIBS) $(VENUSLIBDEP)
"$(VENUSO) $(VENUSDO)" \
"$(VENUSLIBEXTRA) $(FVENUSLIBDIR) $(FVENUSLIB)"
-$(VENUSDS): $(VENUSH1) $(VENUSL) $(ROOTCINTTMP)
+$(VENUSDS): $(VENUSH1) $(VENUSL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(VENUSH1) $(VENUSL)
diff --git a/vmc/Module.mk b/vmc/Module.mk
index 52350685fb8..7e9b9ceeca4 100644
--- a/vmc/Module.mk
+++ b/vmc/Module.mk
@@ -42,7 +42,7 @@ $(VMCLIB): $(VMCO) $(VMCDO) $(ORDER_) $(MAINLIBS) $(VMCLIBDEP)
"$(SOFLAGS)" libVMC.$(SOEXT) $@ "$(VMCO) $(VMCDO)" \
"$(VMCLIBEXTRA)"
-$(VMCDS): $(VMCH1) $(VMCL) $(ROOTCINTTMP)
+$(VMCDS): $(VMCH1) $(VMCL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(VMCH1) $(VMCL)
diff --git a/win32gdk/Module.mk b/win32gdk/Module.mk
index e4b99ec6938..4020fa9f605 100644
--- a/win32gdk/Module.mk
+++ b/win32gdk/Module.mk
@@ -83,7 +83,7 @@ $(WIN32GDKLIB): $(WIN32GDKO) $(WIN32GDKDO) $(FREETYPEDEP) $(GDKLIB) $(GDKDLL) \
"$(WIN32GDKO) $(WIN32GDKDO)" \
"$(FREETYPELDFLAGS) $(FREETYPELIB) $(GDKLIB) $(WIN32GDKLIBEXTRA)"
-$(WIN32GDKDS): $(WIN32GDKH1) $(WIN32GDKL) $(ROOTCINTTMP)
+$(WIN32GDKDS): $(WIN32GDKH1) $(WIN32GDKL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(WIN32GDKH1) $(WIN32GDKL)
diff --git a/winnt/Module.mk b/winnt/Module.mk
index 154ba4fbe5d..cda680d3880 100644
--- a/winnt/Module.mk
+++ b/winnt/Module.mk
@@ -34,7 +34,7 @@ INCLUDEFILES += $(WINNTDEP)
include/%.h: $(WINNTDIRI)/%.h
cp $< $@
-$(WINNTDS): $(WINNTH1) $(WINNTL) $(ROOTCINTTMP)
+$(WINNTDS): $(WINNTH1) $(WINNTL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(WINNTH1) $(WINNTL)
diff --git a/x11/Module.mk b/x11/Module.mk
index 8c067ebaa03..2ec73dedd9c 100644
--- a/x11/Module.mk
+++ b/x11/Module.mk
@@ -43,7 +43,7 @@ $(X11LIB): $(X11O) $(X11DO) $(ORDER_) $(MAINLIBS)
"$(SOFLAGS)" libGX11.$(SOEXT) $@ "$(X11O) $(X11DO)" \
"$(X11LIBEXTRA) $(XLIBS)"
-$(X11DS): $(X11H1) $(X11L) $(ROOTCINTTMP)
+$(X11DS): $(X11H1) $(X11L) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(X11H1) $(X11L)
diff --git a/x11ttf/Module.mk b/x11ttf/Module.mk
index c0550f51d5e..6c6fa91d131 100644
--- a/x11ttf/Module.mk
+++ b/x11ttf/Module.mk
@@ -43,7 +43,7 @@ $(X11TTFLIB): $(X11TTFO) $(X11TTFDO) $(FREETYPEDEP) $(ORDER_) $(MAINLIBS) $(X1
"$(FREETYPELDFLAGS) $(FREETYPELIB) \
$(X11TTFLIBEXTRA) $(XLIBS)"
-$(X11TTFDS): $(X11TTFH) $(X11TTFL) $(ROOTCINTTMP)
+$(X11TTFDS): $(X11TTFH) $(X11TTFL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(X11TTFH) $(X11TTFL)
diff --git a/x3d/Module.mk b/x3d/Module.mk
index 0c5111a8f5c..ffa66cfa3fe 100644
--- a/x3d/Module.mk
+++ b/x3d/Module.mk
@@ -44,7 +44,7 @@ $(X3DLIB): $(X3DO) $(X3DDO) $(ORDER_) $(MAINLIBS) $(X3DLIBDEP)
"$(SOFLAGS)" libX3d.$(SOEXT) $@ "$(X3DO) $(X3DDO)" \
"$(X3DLIBEXTRA) $(XLIBS)"
-$(X3DDS): $(X3DH1) $(X3DL) $(ROOTCINTTMP)
+$(X3DDS): $(X3DH1) $(X3DL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(X3DH1) $(X3DL)
diff --git a/xml/Module.mk b/xml/Module.mk
index 19b1cc0b793..7e100a3fb37 100644
--- a/xml/Module.mk
+++ b/xml/Module.mk
@@ -40,7 +40,7 @@ $(XMLLIB): $(XMLO) $(XMLDO) $(ORDER_) $(MAINLIBS)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libXMLIO.$(SOEXT) $@ "$(XMLO) $(XMLDO)"
-$(XMLDS): $(XMLH) $(XMLL) $(ROOTCINTTMP)
+$(XMLDS): $(XMLH) $(XMLL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(XMLH) $(XMLL)
diff --git a/xmlparser/Module.mk b/xmlparser/Module.mk
index 89ad7b80874..e818bae76cc 100644
--- a/xmlparser/Module.mk
+++ b/xmlparser/Module.mk
@@ -42,7 +42,7 @@ $(XMLPARSERLIB): $(XMLPARSERO) $(XMLPARSERDO) $(ORDER_) $(MAINLIBS)
"$(XMLPARSERO) $(XMLPARSERDO)" \
"$(XMLLIBDIR) $(XMLCLILIB)"
-$(XMLPARSERDS): $(XMLPARSERH) $(XMLPARSERL) $(ROOTCINTTMP)
+$(XMLPARSERDS): $(XMLPARSERH) $(XMLPARSERL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(XMLPARSERH) $(XMLPARSERL)
--
GitLab