diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b37e1de4b6fe..88f007a4c38cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -198,7 +198,13 @@ if(cxxmodules) DEPENDS build/unix/module.modulemap COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/build/unix/module.modulemap ${CMAKE_BINARY_DIR}/include/module.modulemap ) - add_dependencies(copymodulemap move_headers) + get_property(__modulemap_extra_content GLOBAL PROPERTY ROOT_CXXMODULES_EXTRA_MODULEMAP_CONTENT) + string(REPLACE ";" "" __modulemap_extra_content "module ROOT {\\n ${__modulemap_extra_content} \\n }") + add_custom_command(TARGET copymodulemap POST_BUILD + COMMAND echo ${__modulemap_extra_content} >> ${CMAKE_BINARY_DIR}/include/module.modulemap + VERBATIM + ) + add_dependencies(move_headers copymodulemap) endif(cxxmodules) #---hsimple.root---------(use the executable for clearer dependencies and proper return code)--- diff --git a/Makefile b/Makefile index 927386ab41efd..a90d1e0ace8f0 100644 --- a/Makefile +++ b/Makefile @@ -592,6 +592,11 @@ endif ##### all ##### ALLHDRS := ifeq ($(CXXMODULES),yes) +# Add the ROOT Core module. It is organized differently and we cannot do it in +# a Module.mk +CXXMODULES_HEADERS := +CXXMODULES_MODULEMAP_CONTENTS := + # Copy the modulemap in $ROOTSYS/include first. ALLHDRS := include/module.modulemap ROOT_CXXMODULES_CXXFLAGS = -fmodules -fcxx-modules -fmodules-cache-path=$(ROOT_OBJDIR)/include/pcms/ @@ -832,8 +837,40 @@ $(COMPILEDATA): $(ROOT_SRCDIR)/config/Makefile.$(ARCH) config/Makefile.comp Make "$(EXPLICITLINK)" ifeq ($(CXXMODULES),yes) -include/module.modulemap: $(ROOT_SRCDIR)/build/unix/module.modulemap + +# We cannot use the usual way of setting CXXMODULES_MODULEMAP_CONTENTS for core, +# because we require information from the core submodules. Thus we have to access +# the information at the target. +# +# We use the relative path of COREDICT. +# FIXME: We probably should be chaning the COREDICTH to use relative paths, too. +# COREDICTH = $(BASEDICTH) $(CONTH) $(METADICTH) $(SYSTEMDICTH) \ +# $(ZIPDICTH) $(CLIBHH) $(METAUTILSH) $(TEXTINPUTH) +include/module.modulemap: +COREDICTH_REL := $(BASEH_REL) $(CONTH_REL) $(METAH_REL) $(METAUTILSH_REL) +COREDICTH_REL := $(patsubst include/%,%, $(COREDICTH_REL)) +CXXMODULES_CORE_EXCLUDE := RConversionRuleParser.h RConfig.h RVersion.h RtypesImp.h \ + Rtypes.h RtypesCore.h TClassEdit.h TMetaUtils.h \ + TSchemaType.h DllImport.h Rtypeinfo.h TGenericClassInfo.h \ + TSchemaHelper.h ESTLType.h RStringView.h Varargs.h \ + RootMetaSelection.h TString.h Riosfwd.h TMathBase.h \ + RWrap_libcpp_string_view.h TAtomicCountGcc.h \ + TException.h ROOT/TThreadExecutor.hxx TBranchProxyTemplate.h \ + TGLIncludes.h TGLWSIncludes.h snprintf.h strlcpy.h +COREDICTH_REL := $(filter-out $(CXXMODULES_CORE_EXCLUDE),$(COREDICTH_REL)) +CXXMODULES_CORE_HEADERS := $(patsubst %,header \"%\"\\n, $(COREDICTH_REL)) +CXXMODULES_CORE_MODULEMAP_CONTENTS := module Core { \\n \ + requires cplusplus \\n \ + $(CXXMODULES_CORE_HEADERS) \ + export * \\n \ + link \"$(CORELIB)\" \\n \ + } \\n +include/module.modulemap: $(ROOT_SRCDIR)/build/unix/module.modulemap cp $< $@ + @echo "module ROOT {\\n" >> $@ + @echo "$(CXXMODULES_CORE_MODULEMAP_CONTENTS)" >> $@ + @echo "$(CXXMODULES_MODULEMAP_CONTENTS)" >> $@ + @echo "} //module ROOT \\n" >> $@ endif # We rebuild GITCOMMITH only when we would re-link libCore anyway. diff --git a/bindings/pyroot/Module.mk b/bindings/pyroot/Module.mk index 812f96b629450..3bf0d08650948 100644 --- a/bindings/pyroot/Module.mk +++ b/bindings/pyroot/Module.mk @@ -61,9 +61,18 @@ ROOTAASC := $(ROOTAAS:.py=.pyc) ROOTAASO := $(ROOTAAS:.py=.pyo) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) +PYROOTH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYROOTH)) +ALLHDRS += $(PYROOTH_REL) ALLLIBS += $(PYROOTLIB) ALLMAPS += $(PYROOTMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PYROOTH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module $(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PYROOTLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PYROOTDEP) diff --git a/bindings/r/Module.mk b/bindings/r/Module.mk index 0dc62b8d816fd..0419664127dbc 100644 --- a/bindings/r/Module.mk +++ b/bindings/r/Module.mk @@ -48,9 +48,18 @@ RLIB := $(LPATH)/libRInterface.$(SOEXT) RMAP := $(RLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RH)) +RH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(RH)) +ALLHDRS += $(RH_REL) ALLLIBS += $(RLIB) ALLMAPS += $(RMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(RH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module $(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(RLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(RDEP) diff --git a/bindings/ruby/Module.mk b/bindings/ruby/Module.mk index 64b6d8dc2b3c9..e18aaec9f895a 100644 --- a/bindings/ruby/Module.mk +++ b/bindings/ruby/Module.mk @@ -28,9 +28,19 @@ RUBYROOTLIB := $(LPATH)/libRuby.$(SOEXT) RUBYROOTMAP := $(RUBYROOTLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RUBYROOTH)) +RUBYROOTH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(RUBYROOTH)) +ALLHDRS += $(RUBYROOTH_REL) ALLLIBS += $(RUBYROOTLIB) ALLMAPS += $(RUBYROOTMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(RUBYROOTH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module $(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(RUBYROOTLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif + # include all dependency files INCLUDEFILES += $(RUBYROOTDEP) diff --git a/build/unix/module.modulemap b/build/unix/module.modulemap index 406c7f8c5a0f6..9912fe7281901 100644 --- a/build/unix/module.modulemap +++ b/build/unix/module.modulemap @@ -1,2069 +1,52 @@ -// make print-ALLHDRS | tr " " '\n' | sort -u | cut -d '/' -f2,3,4,5 | xargs -I $ echo module \"$\" { header \"$\" export \* } -module "AuthConst.h" { header "AuthConst.h" export * } -module "Bswapcpy.h" { header "Bswapcpy.h" export * } -module "Buttons.h" { header "Buttons.h" export * } -module "Bytes.h" { header "Bytes.h" export * } -module "Byteswap.h" { header "Byteswap.h" export * } -module "CintLDAP.h" { header "CintLDAP.h" export * } -module "CocoaGuiTypes.h" { header "CocoaGuiTypes.h" export * } -module "CocoaUtils.h" { header "CocoaUtils.h" export * } -module "Compression.h" { header "Compression.h" export * } -module "Demangle.h" { header "Demangle.h" export * } -module "DllImport.h" { header "DllImport.h" export * } -module "ESTLType.h" { header "ESTLType.h" export * } -module "Fit/BasicFCN.h" { header "Fit/BasicFCN.h" export * } -module "Fit/BinData.h" { header "Fit/BinData.h" export * } -module "Fit/BinPoint.h" { header "Fit/BinPoint.h" export * } -module "Fit/Chi2FCN.h" { header "Fit/Chi2FCN.h" export * } -module "Fit/DataOptions.h" { header "Fit/DataOptions.h" export * } -module "Fit/DataRange.h" { header "Fit/DataRange.h" export * } -module "Fit/DataVector.h" { header "Fit/DataVector.h" export * } -module "Fit/DataVectorfwd.h" { header "Fit/DataVectorfwd.h" export * } -module "Fit/FcnAdapter.h" { header "Fit/FcnAdapter.h" export * } -module "Fit/FitConfig.h" { header "Fit/FitConfig.h" export * } -module "Fit/FitResult.h" { header "Fit/FitResult.h" export * } -module "Fit/FitUtil.h" { header "Fit/FitUtil.h" export * } -module "Fit/FitUtilParallel.h" { header "Fit/FitUtilParallel.h" export * } -module "Fit/Fitter.h" { header "Fit/Fitter.h" export * } -module "Fit/LogLikelihoodFCN.h" { header "Fit/LogLikelihoodFCN.h" export * } -module "Fit/ParameterSettings.h" { header "Fit/ParameterSettings.h" export * } -module "Fit/PoissonLikelihoodFCN.h" { header "Fit/PoissonLikelihoodFCN.h" export * } -module "Fit/SparseData.h" { header "Fit/SparseData.h" export * } -module "Fit/UnBinData.h" { header "Fit/UnBinData.h" export * } -module "FontCache.h" { header "FontCache.h" export * } -module "Foption.h" { header "Foption.h" export * } -module "GL/glew.h" [extern_c] { - header "GL/glew.h" - export * -} -module "GL/glxew.h" { header "GL/glxew.h" export * } -module "GL/wglew.h" { header "GL/wglew.h" export * } -module "GLConstants.h" { header "GLConstants.h" export * } -module "Getline.h" { header "Getline.h" export * } -module "Gtypes.h" { header "Gtypes.h" export * } -module "GuiTypes.h" { header "GuiTypes.h" export * } -module "HFitInterface.h" { header "HFitInterface.h" export * } -module "HelpSMText.h" { header "HelpSMText.h" export * } -module "HelpText.h" { header "HelpText.h" export * } -module "HelpTextTV.h" { header "HelpTextTV.h" export * } -module "Hepevt.h" { header "Hepevt.h" export * } -module "Hoption.h" { header "Hoption.h" export * } -module "Hparam.h" { header "Hparam.h" export * } -module "Htypes.h" { header "Htypes.h" export * } -module "KeySymbols.h" { header "KeySymbols.h" export * } -module "Krb5Auth.h" { header "Krb5Auth.h" export * } -module "MPCode.h" { header "MPCode.h" export * } -module "MPSendRecv.h" { header "MPSendRecv.h" export * } -module "Match.h" { header "Match.h" export * } -module "Math/AdaptiveIntegratorMultiDim.h" { header "Math/AdaptiveIntegratorMultiDim.h" export * } -module "Math/AllIntegrationTypes.h" { header "Math/AllIntegrationTypes.h" export * } -module "Math/AxisAngle.h" { header "Math/AxisAngle.h" export * } -module "Math/BasicMinimizer.h" { header "Math/BasicMinimizer.h" export * } -module "Math/BinaryOpPolicy.h" { header "Math/BinaryOpPolicy.h" export * } -module "Math/BinaryOperators.h" { header "Math/BinaryOperators.h" export * } -module "Math/Boost.h" { header "Math/Boost.h" export * } -module "Math/BoostX.h" { header "Math/BoostX.h" export * } -module "Math/BoostY.h" { header "Math/BoostY.h" export * } -module "Math/BoostZ.h" { header "Math/BoostZ.h" export * } -module "Math/BrentMethods.h" { header "Math/BrentMethods.h" export * } -module "Math/BrentMinimizer1D.h" { header "Math/BrentMinimizer1D.h" export * } -module "Math/BrentRootFinder.h" { header "Math/BrentRootFinder.h" export * } -module "Math/Cartesian2D.h" { header "Math/Cartesian2D.h" export * } -module "Math/Cartesian3D.h" { header "Math/Cartesian3D.h" export * } -module "Math/ChebyshevPol.h" { header "Math/ChebyshevPol.h" export * } -module "Math/CholeskyDecomp.h" { header "Math/CholeskyDecomp.h" export * } -//module "Math/CramerInversion.icc" { header "Math/CramerInversion.icc" export * } -//module "Math/CramerInversionSym.icc" { header "Math/CramerInversionSym.icc" export * } -module "Math/Cylindrical3D.h" { header "Math/Cylindrical3D.h" export * } -module "Math/CylindricalEta3D.h" { header "Math/CylindricalEta3D.h" export * } -module "Math/Delaunay2D.h" { header "Math/Delaunay2D.h" export * } -module "Math/Dfact.h" { header "Math/Dfact.h" export * } -module "Math/Dfactir.h" { header "Math/Dfactir.h" export * } -module "Math/Dfinv.h" { header "Math/Dfinv.h" export * } -module "Math/Dinv.h" { header "Math/Dinv.h" export * } -module "Math/DisplacementVector2D.h" { header "Math/DisplacementVector2D.h" export * } -module "Math/DisplacementVector3D.h" { header "Math/DisplacementVector3D.h" export * } -module "Math/DistFunc.h" { header "Math/DistFunc.h" export * } -module "Math/DistFuncMathCore.h" { header "Math/DistFuncMathCore.h" export * } -module "Math/DistSampler.h" { header "Math/DistSampler.h" export * } -module "Math/DistSamplerOptions.h" { header "Math/DistSamplerOptions.h" export * } -module "Math/Dsfact.h" { header "Math/Dsfact.h" export * } -module "Math/Dsinv.h" { header "Math/Dsinv.h" export * } -module "Math/Error.h" { header "Math/Error.h" export * } -module "Math/EulerAngles.h" { header "Math/EulerAngles.h" export * } -module "Math/Expression.h" { header "Math/Expression.h" export * } -module "Math/Factory.h" { header "Math/Factory.h" export * } -module "Math/FitMethodFunction.h" { header "Math/FitMethodFunction.h" export * } -module "Math/Functions.h" { header "Math/Functions.h" export * } -module "Math/Functor.h" { header "Math/Functor.h" export * } -module "Math/GaussIntegrator.h" { header "Math/GaussIntegrator.h" export * } -module "Math/GaussLegendreIntegrator.h" { header "Math/GaussLegendreIntegrator.h" export * } -module "Math/GenAlgoOptions.h" { header "Math/GenAlgoOptions.h" export * } -module "Math/GenVector/3DConversions.h" { header "Math/GenVector/3DConversions.h" export * } -module "Math/GenVector/3DDistances.h" { header "Math/GenVector/3DDistances.h" export * } -module "Math/GenVector/AxisAngle.h" { header "Math/GenVector/AxisAngle.h" export * } -module "Math/GenVector/AxisAnglefwd.h" { header "Math/GenVector/AxisAnglefwd.h" export * } -module "Math/GenVector/BitReproducible.h" { header "Math/GenVector/BitReproducible.h" export * } -module "Math/GenVector/Boost.h" { header "Math/GenVector/Boost.h" export * } -module "Math/GenVector/BoostX.h" { header "Math/GenVector/BoostX.h" export * } -module "Math/GenVector/BoostXfwd.h" { header "Math/GenVector/BoostXfwd.h" export * } -module "Math/GenVector/BoostY.h" { header "Math/GenVector/BoostY.h" export * } -module "Math/GenVector/BoostYfwd.h" { header "Math/GenVector/BoostYfwd.h" export * } -module "Math/GenVector/BoostZ.h" { header "Math/GenVector/BoostZ.h" export * } -module "Math/GenVector/BoostZfwd.h" { header "Math/GenVector/BoostZfwd.h" export * } -module "Math/GenVector/Boostfwd.h" { header "Math/GenVector/Boostfwd.h" export * } -module "Math/GenVector/Cartesian2D.h" { header "Math/GenVector/Cartesian2D.h" export * } -module "Math/GenVector/Cartesian2Dfwd.h" { header "Math/GenVector/Cartesian2Dfwd.h" export * } -module "Math/GenVector/Cartesian3D.h" { header "Math/GenVector/Cartesian3D.h" export * } -module "Math/GenVector/Cartesian3Dfwd.h" { header "Math/GenVector/Cartesian3Dfwd.h" export * } -module "Math/GenVector/CoordinateSystemTags.h" { header "Math/GenVector/CoordinateSystemTags.h" export * } -module "Math/GenVector/Cylindrical3D.h" { header "Math/GenVector/Cylindrical3D.h" export * } -module "Math/GenVector/Cylindrical3Dfwd.h" { header "Math/GenVector/Cylindrical3Dfwd.h" export * } -module "Math/GenVector/CylindricalEta3D.h" { header "Math/GenVector/CylindricalEta3D.h" export * } -module "Math/GenVector/CylindricalEta3Dfwd.h" { header "Math/GenVector/CylindricalEta3Dfwd.h" export * } -module "Math/GenVector/DisplacementVector2D.h" { header "Math/GenVector/DisplacementVector2D.h" export * } -module "Math/GenVector/DisplacementVector2Dfwd.h" { header "Math/GenVector/DisplacementVector2Dfwd.h" export * } -module "Math/GenVector/DisplacementVector3D.h" { header "Math/GenVector/DisplacementVector3D.h" export * } -module "Math/GenVector/DisplacementVector3Dfwd.h" { header "Math/GenVector/DisplacementVector3Dfwd.h" export * } -module "Math/GenVector/EulerAngles.h" { header "Math/GenVector/EulerAngles.h" export * } -module "Math/GenVector/EulerAnglesfwd.h" { header "Math/GenVector/EulerAnglesfwd.h" export * } -module "Math/GenVector/GenVectorIO.h" { header "Math/GenVector/GenVectorIO.h" export * } -module "Math/GenVector/GenVector_exception.h" { header "Math/GenVector/GenVector_exception.h" export * } -module "Math/GenVector/LorentzRotation.h" { header "Math/GenVector/LorentzRotation.h" export * } -module "Math/GenVector/LorentzRotationfwd.h" { header "Math/GenVector/LorentzRotationfwd.h" export * } -module "Math/GenVector/LorentzVector.h" { header "Math/GenVector/LorentzVector.h" export * } -module "Math/GenVector/LorentzVectorfwd.h" { header "Math/GenVector/LorentzVectorfwd.h" export * } -module "Math/GenVector/Plane3D.h" { header "Math/GenVector/Plane3D.h" export * } -module "Math/GenVector/Polar2D.h" { header "Math/GenVector/Polar2D.h" export * } -module "Math/GenVector/Polar2Dfwd.h" { header "Math/GenVector/Polar2Dfwd.h" export * } -module "Math/GenVector/Polar3D.h" { header "Math/GenVector/Polar3D.h" export * } -module "Math/GenVector/Polar3Dfwd.h" { header "Math/GenVector/Polar3Dfwd.h" export * } -module "Math/GenVector/PositionVector2D.h" { header "Math/GenVector/PositionVector2D.h" export * } -module "Math/GenVector/PositionVector2Dfwd.h" { header "Math/GenVector/PositionVector2Dfwd.h" export * } -module "Math/GenVector/PositionVector3D.h" { header "Math/GenVector/PositionVector3D.h" export * } -module "Math/GenVector/PositionVector3Dfwd.h" { header "Math/GenVector/PositionVector3Dfwd.h" export * } -module "Math/GenVector/PtEtaPhiE4D.h" { header "Math/GenVector/PtEtaPhiE4D.h" export * } -module "Math/GenVector/PtEtaPhiE4Dfwd.h" { header "Math/GenVector/PtEtaPhiE4Dfwd.h" export * } -module "Math/GenVector/PtEtaPhiM4D.h" { header "Math/GenVector/PtEtaPhiM4D.h" export * } -module "Math/GenVector/PtEtaPhiM4Dfwd.h" { header "Math/GenVector/PtEtaPhiM4Dfwd.h" export * } -module "Math/GenVector/PxPyPzE4D.h" { header "Math/GenVector/PxPyPzE4D.h" export * } -module "Math/GenVector/PxPyPzE4Dfwd.h" { header "Math/GenVector/PxPyPzE4Dfwd.h" export * } -module "Math/GenVector/PxPyPzM4D.h" { header "Math/GenVector/PxPyPzM4D.h" export * } -module "Math/GenVector/PxPyPzM4Dfwd.h" { header "Math/GenVector/PxPyPzM4Dfwd.h" export * } -module "Math/GenVector/Quaternion.h" { header "Math/GenVector/Quaternion.h" export * } -module "Math/GenVector/Quaternionfwd.h" { header "Math/GenVector/Quaternionfwd.h" export * } -module "Math/GenVector/Rotation3D.h" { header "Math/GenVector/Rotation3D.h" export * } -module "Math/GenVector/Rotation3Dfwd.h" { header "Math/GenVector/Rotation3Dfwd.h" export * } -module "Math/GenVector/RotationX.h" { header "Math/GenVector/RotationX.h" export * } -module "Math/GenVector/RotationXfwd.h" { header "Math/GenVector/RotationXfwd.h" export * } -module "Math/GenVector/RotationY.h" { header "Math/GenVector/RotationY.h" export * } -module "Math/GenVector/RotationYfwd.h" { header "Math/GenVector/RotationYfwd.h" export * } -module "Math/GenVector/RotationZ.h" { header "Math/GenVector/RotationZ.h" export * } -module "Math/GenVector/RotationZYX.h" { header "Math/GenVector/RotationZYX.h" export * } -module "Math/GenVector/RotationZYXfwd.h" { header "Math/GenVector/RotationZYXfwd.h" export * } -module "Math/GenVector/RotationZfwd.h" { header "Math/GenVector/RotationZfwd.h" export * } -module "Math/GenVector/Transform3D.h" { header "Math/GenVector/Transform3D.h" export * } -module "Math/GenVector/Translation3D.h" { header "Math/GenVector/Translation3D.h" export * } -module "Math/GenVector/VectorUtil.h" { header "Math/GenVector/VectorUtil.h" export * } -module "Math/GenVector/eta.h" { header "Math/GenVector/eta.h" export * } -module "Math/GenVector/etaMax.h" { header "Math/GenVector/etaMax.h" export * } -module "Math/GeneticMinimizer.h" { header "Math/GeneticMinimizer.h" export * } -module "Math/GoFTest.h" { header "Math/GoFTest.h" export * } -module "Math/HelperOps.h" { header "Math/HelperOps.h" export * } -module "Math/IFunction.h" { header "Math/IFunction.h" export * } -module "Math/IFunctionfwd.h" { header "Math/IFunctionfwd.h" export * } -module "Math/IMinimizer1D.h" { header "Math/IMinimizer1D.h" export * } -module "Math/IOptions.h" { header "Math/IOptions.h" export * } -module "Math/IParamFunction.h" { header "Math/IParamFunction.h" export * } -module "Math/IParamFunctionfwd.h" { header "Math/IParamFunctionfwd.h" export * } -module "Math/IRootFinderMethod.h" { header "Math/IRootFinderMethod.h" export * } -module "Math/Integrator.h" { header "Math/Integrator.h" export * } -module "Math/IntegratorMultiDim.h" { header "Math/IntegratorMultiDim.h" export * } -module "Math/IntegratorOptions.h" { header "Math/IntegratorOptions.h" export * } -module "Math/KDTree.h" { header "Math/KDTree.h" export * } -//module "Math/KDTree.icc" { header "Math/KDTree.icc" export * } -module "Math/LorentzRotation.h" { header "Math/LorentzRotation.h" export * } -module "Math/LorentzVector.h" { header "Math/LorentzVector.h" export * } -module "Math/MConfig.h" { header "Math/MConfig.h" export * } -module "Math/Math.h" { header "Math/Math.h" export * } -module "Math/MatrixFunctions.h" { header "Math/MatrixFunctions.h" export * } -//module "Math/MatrixInversion.icc" { header "Math/MatrixInversion.icc" export * } -module "Math/MatrixRepresentationsStatic.h" { header "Math/MatrixRepresentationsStatic.h" export * } -module "Math/MersenneTwisterEngine.h" { header "Math/MersenneTwisterEngine.h" export * } -module "Math/MinimTransformFunction.h" { header "Math/MinimTransformFunction.h" export * } -module "Math/MinimTransformVariable.h" { header "Math/MinimTransformVariable.h" export * } -module "Math/Minimizer.h" { header "Math/Minimizer.h" export * } -module "Math/MinimizerOptions.h" { header "Math/MinimizerOptions.h" export * } -module "Math/MinimizerVariableTransformation.h" { header "Math/MinimizerVariableTransformation.h" export * } -module "Math/MixMaxEngine.h" { header "Math/MixMaxEngine.h" export * } -module "Math/MultiDimParamFunctionAdapter.h" { header "Math/MultiDimParamFunctionAdapter.h" export * } -module "Math/OneDimFunctionAdapter.h" { header "Math/OneDimFunctionAdapter.h" export * } -module "Math/ParamFunctor.h" { header "Math/ParamFunctor.h" export * } -module "Math/PdfFunc.h" { header "Math/PdfFunc.h" export * } -module "Math/PdfFuncMathCore.h" { header "Math/PdfFuncMathCore.h" export * } -module "Math/Plane3D.h" { header "Math/Plane3D.h" export * } -module "Math/Point2D.h" { header "Math/Point2D.h" export * } -module "Math/Point2Dfwd.h" { header "Math/Point2Dfwd.h" export * } -module "Math/Point3D.h" { header "Math/Point3D.h" export * } -module "Math/Point3Dfwd.h" { header "Math/Point3Dfwd.h" export * } -module "Math/Polar2D.h" { header "Math/Polar2D.h" export * } -module "Math/Polar3D.h" { header "Math/Polar3D.h" export * } -module "Math/PositionVector2D.h" { header "Math/PositionVector2D.h" export * } -module "Math/PositionVector3D.h" { header "Math/PositionVector3D.h" export * } -module "Math/ProbFunc.h" { header "Math/ProbFunc.h" export * } -module "Math/ProbFuncMathCore.h" { header "Math/ProbFuncMathCore.h" export * } -module "Math/PtEtaPhiE4D.h" { header "Math/PtEtaPhiE4D.h" export * } -module "Math/PtEtaPhiM4D.h" { header "Math/PtEtaPhiM4D.h" export * } -module "Math/PxPyPzE4D.h" { header "Math/PxPyPzE4D.h" export * } -module "Math/PxPyPzM4D.h" { header "Math/PxPyPzM4D.h" export * } -module "Math/QuantFunc.h" { header "Math/QuantFunc.h" export * } -module "Math/QuantFuncMathCore.h" { header "Math/QuantFuncMathCore.h" export * } -module "Math/Quaternion.h" { header "Math/Quaternion.h" export * } -module "Math/Random.h" { header "Math/Random.h" export * } -module "Math/RandomFunctions.h" { header "Math/RandomFunctions.h" export * } -module "Math/RichardsonDerivator.h" { header "Math/RichardsonDerivator.h" export * } -module "Math/RootFinder.h" { header "Math/RootFinder.h" export * } -module "Math/Rotation3D.h" { header "Math/Rotation3D.h" export * } -module "Math/RotationX.h" { header "Math/RotationX.h" export * } -module "Math/RotationY.h" { header "Math/RotationY.h" export * } -module "Math/RotationZ.h" { header "Math/RotationZ.h" export * } -module "Math/RotationZYX.h" { header "Math/RotationZYX.h" export * } -module "Math/SMatrix.h" { header "Math/SMatrix.h" export * } -//module "Math/SMatrix.icc" { header "Math/SMatrix.icc" export * } -module "Math/SMatrixDfwd.h" { header "Math/SMatrixDfwd.h" export * } -module "Math/SMatrixFfwd.h" { header "Math/SMatrixFfwd.h" export * } -module "Math/SVector.h" { header "Math/SVector.h" export * } -//module "Math/SVector.icc" { header "Math/SVector.icc" export * } -module "Math/SpecFunc.h" { header "Math/SpecFunc.h" export * } -module "Math/SpecFuncMathCore.h" { header "Math/SpecFuncMathCore.h" export * } -module "Math/StaticCheck.h" { header "Math/StaticCheck.h" export * } -module "Math/StdRandomEngines.h" { header "Math/StdRandomEngines.h" export * } -module "Math/TDataPoint.h" { header "Math/TDataPoint.h" export * } -//module "Math/TDataPoint.icc" { header "Math/TDataPoint.icc" export * } -module "Math/TDataPointN.h" { header "Math/TDataPointN.h" export * } -//module "Math/TDataPointN.icc" { header "Math/TDataPointN.icc" export * } -module "Math/TRandomEngine.h" { header "Math/TRandomEngine.h" export * } -module "Math/Transform3D.h" { header "Math/Transform3D.h" export * } -module "Math/Translation3D.h" { header "Math/Translation3D.h" export * } -module "Math/UnaryOperators.h" { header "Math/UnaryOperators.h" export * } -module "Math/Util.h" { header "Math/Util.h" export * } -module "Math/Vector2D.h" { header "Math/Vector2D.h" export * } -module "Math/Vector2Dfwd.h" { header "Math/Vector2Dfwd.h" export * } -module "Math/Vector3D.h" { header "Math/Vector3D.h" export * } -module "Math/Vector3Dfwd.h" { header "Math/Vector3Dfwd.h" export * } -module "Math/Vector4D.h" { header "Math/Vector4D.h" export * } -module "Math/Vector4Dfwd.h" { header "Math/Vector4Dfwd.h" export * } -module "Math/VectorUtil.h" { header "Math/VectorUtil.h" export * } -module "Math/VirtualIntegrator.h" { header "Math/VirtualIntegrator.h" export * } -module "Math/WrappedFunction.h" { header "Math/WrappedFunction.h" export * } -module "Math/WrappedMultiTF1.h" { header "Math/WrappedMultiTF1.h" export * } -module "Math/WrappedParamFunction.h" { header "Math/WrappedParamFunction.h" export * } -module "Math/WrappedTF1.h" { header "Math/WrappedTF1.h" export * } -module "MemCheck.h" { header "MemCheck.h" export * } -module "MenuLoader.h" { header "MenuLoader.h" export * } -module "MessageTypes.h" { header "MessageTypes.h" export * } -module "Minuit2/ABObj.h" { header "Minuit2/ABObj.h" export * } -module "Minuit2/ABProd.h" { header "Minuit2/ABProd.h" export * } -module "Minuit2/ABSum.h" { header "Minuit2/ABSum.h" export * } -module "Minuit2/ABTypes.h" { header "Minuit2/ABTypes.h" export * } -module "Minuit2/AnalyticalGradientCalculator.h" { header "Minuit2/AnalyticalGradientCalculator.h" export * } -module "Minuit2/BasicFunctionGradient.h" { header "Minuit2/BasicFunctionGradient.h" export * } -module "Minuit2/BasicFunctionMinimum.h" { header "Minuit2/BasicFunctionMinimum.h" export * } -module "Minuit2/BasicMinimumError.h" { header "Minuit2/BasicMinimumError.h" export * } -module "Minuit2/BasicMinimumParameters.h" { header "Minuit2/BasicMinimumParameters.h" export * } -module "Minuit2/BasicMinimumSeed.h" { header "Minuit2/BasicMinimumSeed.h" export * } -module "Minuit2/BasicMinimumState.h" { header "Minuit2/BasicMinimumState.h" export * } -module "Minuit2/CombinedMinimizer.h" { header "Minuit2/CombinedMinimizer.h" export * } -module "Minuit2/CombinedMinimumBuilder.h" { header "Minuit2/CombinedMinimumBuilder.h" export * } -module "Minuit2/ContoursError.h" { header "Minuit2/ContoursError.h" export * } -module "Minuit2/DavidonErrorUpdator.h" { header "Minuit2/DavidonErrorUpdator.h" export * } -module "Minuit2/FCNAdapter.h" { header "Minuit2/FCNAdapter.h" export * } -module "Minuit2/FCNBase.h" { header "Minuit2/FCNBase.h" export * } -module "Minuit2/FCNGradAdapter.h" { header "Minuit2/FCNGradAdapter.h" export * } -module "Minuit2/FCNGradientBase.h" { header "Minuit2/FCNGradientBase.h" export * } -module "Minuit2/FumiliBuilder.h" { header "Minuit2/FumiliBuilder.h" export * } -module "Minuit2/FumiliChi2FCN.h" { header "Minuit2/FumiliChi2FCN.h" export * } -module "Minuit2/FumiliErrorUpdator.h" { header "Minuit2/FumiliErrorUpdator.h" export * } -module "Minuit2/FumiliFCNAdapter.h" { header "Minuit2/FumiliFCNAdapter.h" export * } -module "Minuit2/FumiliFCNBase.h" { header "Minuit2/FumiliFCNBase.h" export * } -module "Minuit2/FumiliGradientCalculator.h" { header "Minuit2/FumiliGradientCalculator.h" export * } -module "Minuit2/FumiliMaximumLikelihoodFCN.h" { header "Minuit2/FumiliMaximumLikelihoodFCN.h" export * } -module "Minuit2/FumiliMinimizer.h" { header "Minuit2/FumiliMinimizer.h" export * } -module "Minuit2/FumiliStandardChi2FCN.h" { header "Minuit2/FumiliStandardChi2FCN.h" export * } -module "Minuit2/FumiliStandardMaximumLikelihoodFCN.h" { header "Minuit2/FumiliStandardMaximumLikelihoodFCN.h" export * } -module "Minuit2/FunctionGradient.h" { header "Minuit2/FunctionGradient.h" export * } -module "Minuit2/FunctionMinimizer.h" { header "Minuit2/FunctionMinimizer.h" export * } -module "Minuit2/FunctionMinimum.h" { header "Minuit2/FunctionMinimum.h" export * } -module "Minuit2/GenericFunction.h" { header "Minuit2/GenericFunction.h" export * } -module "Minuit2/GradientCalculator.h" { header "Minuit2/GradientCalculator.h" export * } -module "Minuit2/HessianGradientCalculator.h" { header "Minuit2/HessianGradientCalculator.h" export * } -module "Minuit2/InitialGradientCalculator.h" { header "Minuit2/InitialGradientCalculator.h" export * } -module "Minuit2/LASymMatrix.h" { header "Minuit2/LASymMatrix.h" export * } -module "Minuit2/LAVector.h" { header "Minuit2/LAVector.h" export * } -module "Minuit2/LaInverse.h" { header "Minuit2/LaInverse.h" export * } -module "Minuit2/LaOuterProduct.h" { header "Minuit2/LaOuterProduct.h" export * } -module "Minuit2/LaProd.h" { header "Minuit2/LaProd.h" export * } -module "Minuit2/LaSum.h" { header "Minuit2/LaSum.h" export * } -module "Minuit2/MPIProcess.h" { header "Minuit2/MPIProcess.h" export * } -module "Minuit2/MatrixInverse.h" { header "Minuit2/MatrixInverse.h" export * } -module "Minuit2/MinimumBuilder.h" { header "Minuit2/MinimumBuilder.h" export * } -module "Minuit2/MinimumError.h" { header "Minuit2/MinimumError.h" export * } -module "Minuit2/MinimumErrorUpdator.h" { header "Minuit2/MinimumErrorUpdator.h" export * } -module "Minuit2/MinimumParameters.h" { header "Minuit2/MinimumParameters.h" export * } -module "Minuit2/MinimumSeed.h" { header "Minuit2/MinimumSeed.h" export * } -module "Minuit2/MinimumSeedGenerator.h" { header "Minuit2/MinimumSeedGenerator.h" export * } -module "Minuit2/MinimumState.h" { header "Minuit2/MinimumState.h" export * } -module "Minuit2/MinosError.h" { header "Minuit2/MinosError.h" export * } -module "Minuit2/Minuit2Minimizer.h" { header "Minuit2/Minuit2Minimizer.h" export * } -module "Minuit2/MinuitParameter.h" { header "Minuit2/MinuitParameter.h" export * } -module "Minuit2/MnApplication.h" { header "Minuit2/MnApplication.h" export * } -module "Minuit2/MnConfig.h" { header "Minuit2/MnConfig.h" export * } -module "Minuit2/MnContours.h" { header "Minuit2/MnContours.h" export * } -module "Minuit2/MnCovarianceSqueeze.h" { header "Minuit2/MnCovarianceSqueeze.h" export * } -module "Minuit2/MnCross.h" { header "Minuit2/MnCross.h" export * } -module "Minuit2/MnEigen.h" { header "Minuit2/MnEigen.h" export * } -module "Minuit2/MnFcn.h" { header "Minuit2/MnFcn.h" export * } -module "Minuit2/MnFumiliMinimize.h" { header "Minuit2/MnFumiliMinimize.h" export * } -module "Minuit2/MnFunctionCross.h" { header "Minuit2/MnFunctionCross.h" export * } -module "Minuit2/MnGlobalCorrelationCoeff.h" { header "Minuit2/MnGlobalCorrelationCoeff.h" export * } -module "Minuit2/MnHesse.h" { header "Minuit2/MnHesse.h" export * } -module "Minuit2/MnLineSearch.h" { header "Minuit2/MnLineSearch.h" export * } -module "Minuit2/MnMachinePrecision.h" { header "Minuit2/MnMachinePrecision.h" export * } -module "Minuit2/MnMatrix.h" { header "Minuit2/MnMatrix.h" export * } -module "Minuit2/MnMigrad.h" { header "Minuit2/MnMigrad.h" export * } -module "Minuit2/MnMinimize.h" { header "Minuit2/MnMinimize.h" export * } -module "Minuit2/MnMinos.h" { header "Minuit2/MnMinos.h" export * } -module "Minuit2/MnParabola.h" { header "Minuit2/MnParabola.h" export * } -module "Minuit2/MnParabolaFactory.h" { header "Minuit2/MnParabolaFactory.h" export * } -module "Minuit2/MnParabolaPoint.h" { header "Minuit2/MnParabolaPoint.h" export * } -module "Minuit2/MnParameterScan.h" { header "Minuit2/MnParameterScan.h" export * } -module "Minuit2/MnPlot.h" { header "Minuit2/MnPlot.h" export * } -module "Minuit2/MnPosDef.h" { header "Minuit2/MnPosDef.h" export * } -module "Minuit2/MnPrint.h" { header "Minuit2/MnPrint.h" export * } -module "Minuit2/MnRefCountedPointer.h" { header "Minuit2/MnRefCountedPointer.h" export * } -module "Minuit2/MnReferenceCounter.h" { header "Minuit2/MnReferenceCounter.h" export * } -module "Minuit2/MnScan.h" { header "Minuit2/MnScan.h" export * } -module "Minuit2/MnSeedGenerator.h" { header "Minuit2/MnSeedGenerator.h" export * } -module "Minuit2/MnSimplex.h" { header "Minuit2/MnSimplex.h" export * } -module "Minuit2/MnStrategy.h" { header "Minuit2/MnStrategy.h" export * } -module "Minuit2/MnTiny.h" { header "Minuit2/MnTiny.h" export * } -module "Minuit2/MnTraceObject.h" { header "Minuit2/MnTraceObject.h" export * } -module "Minuit2/MnUserCovariance.h" { header "Minuit2/MnUserCovariance.h" export * } -module "Minuit2/MnUserFcn.h" { header "Minuit2/MnUserFcn.h" export * } -module "Minuit2/MnUserParameterState.h" { header "Minuit2/MnUserParameterState.h" export * } -module "Minuit2/MnUserParameters.h" { header "Minuit2/MnUserParameters.h" export * } -module "Minuit2/MnUserTransformation.h" { header "Minuit2/MnUserTransformation.h" export * } -module "Minuit2/MnVectorTransform.h" { header "Minuit2/MnVectorTransform.h" export * } -module "Minuit2/ModularFunctionMinimizer.h" { header "Minuit2/ModularFunctionMinimizer.h" export * } -module "Minuit2/NegativeG2LineSearch.h" { header "Minuit2/NegativeG2LineSearch.h" export * } -module "Minuit2/Numerical2PGradientCalculator.h" { header "Minuit2/Numerical2PGradientCalculator.h" export * } -module "Minuit2/ParametricFunction.h" { header "Minuit2/ParametricFunction.h" export * } -module "Minuit2/ScanBuilder.h" { header "Minuit2/ScanBuilder.h" export * } -module "Minuit2/ScanMinimizer.h" { header "Minuit2/ScanMinimizer.h" export * } -module "Minuit2/SimplexBuilder.h" { header "Minuit2/SimplexBuilder.h" export * } -module "Minuit2/SimplexMinimizer.h" { header "Minuit2/SimplexMinimizer.h" export * } -module "Minuit2/SimplexParameters.h" { header "Minuit2/SimplexParameters.h" export * } -module "Minuit2/SimplexSeedGenerator.h" { header "Minuit2/SimplexSeedGenerator.h" export * } -module "Minuit2/SinParameterTransformation.h" { header "Minuit2/SinParameterTransformation.h" export * } -module "Minuit2/SqrtLowParameterTransformation.h" { header "Minuit2/SqrtLowParameterTransformation.h" export * } -module "Minuit2/SqrtUpParameterTransformation.h" { header "Minuit2/SqrtUpParameterTransformation.h" export * } -module "Minuit2/StackAllocator.h" { header "Minuit2/StackAllocator.h" export * } -module "Minuit2/VariableMetricBuilder.h" { header "Minuit2/VariableMetricBuilder.h" export * } -module "Minuit2/VariableMetricEDMEstimator.h" { header "Minuit2/VariableMetricEDMEstimator.h" export * } -module "Minuit2/VariableMetricMinimizer.h" { header "Minuit2/VariableMetricMinimizer.h" export * } -module "Minuit2/VectorOuterProduct.h" { header "Minuit2/VectorOuterProduct.h" export * } -module "NetErrors.h" { header "NetErrors.h" export * } -module "PoolUtils.h" { header "PoolUtils.h" export * } -module "PosixThreadInc.h" { header "PosixThreadInc.h" export * } -module "QuartzFillArea.h" { header "QuartzFillArea.h" export * } -module "QuartzLine.h" { header "QuartzLine.h" export * } -module "QuartzMarker.h" { header "QuartzMarker.h" export * } -module "QuartzPixmap.h" { header "QuartzPixmap.h" export * } -module "QuartzText.h" { header "QuartzText.h" export * } -module "QuartzUtils.h" { header "QuartzUtils.h" export * } -module "QuartzWindow.h" { header "QuartzWindow.h" export * } -module "RConfig.h" { header "RConfig.h" export * } -module "RConversionRuleParser.h" { header "RConversionRuleParser.h" export * } -module "ROOTApplicationDelegate.h" { header "ROOTApplicationDelegate.h" export * } -module "ROOTOpenGLView.h" { header "ROOTOpenGLView.h" export * } -module "RQ_OBJECT.h" { header "RQ_OBJECT.h" export * } -module "RRemoteProtocol.h" { header "RRemoteProtocol.h" export * } -module "RStipples.h" { header "RStipples.h" export * } -module "RStringView.h" { header "RStringView.h" export * } -module "RVersion.h" { header "RVersion.h" export * } -module "RWrap_libcpp_string_view.h" { - header "RWrap_libcpp_string_view.h" - header "libcpp_string_view.h" - export * -} -module "RZip.h" { header "RZip.h" export * } -module "Riosfwd.h" { header "Riosfwd.h" export * } -module "Riostream.h" { header "Riostream.h" export * } -module "Roo1DMomentMorphFunction.h" { header "Roo1DMomentMorphFunction.h" export * } -module "Roo1DTable.h" { header "Roo1DTable.h" export * } -module "Roo2DKeysPdf.h" { header "Roo2DKeysPdf.h" export * } -module "Roo2DMomentMorphFunction.h" { header "Roo2DMomentMorphFunction.h" export * } -module "RooAICRegistry.h" { header "RooAICRegistry.h" export * } -module "RooAbsAnaConvPdf.h" { header "RooAbsAnaConvPdf.h" export * } -module "RooAbsArg.h" { header "RooAbsArg.h" export * } -module "RooAbsBinning.h" { header "RooAbsBinning.h" export * } -module "RooAbsCache.h" { header "RooAbsCache.h" export * } -module "RooAbsCacheElement.h" { header "RooAbsCacheElement.h" export * } -module "RooAbsCachedPdf.h" { header "RooAbsCachedPdf.h" export * } -module "RooAbsCachedReal.h" { header "RooAbsCachedReal.h" export * } -module "RooAbsCategory.h" { header "RooAbsCategory.h" export * } -module "RooAbsCategoryLValue.h" { header "RooAbsCategoryLValue.h" export * } -module "RooAbsCollection.h" { header "RooAbsCollection.h" export * } -module "RooAbsData.h" { header "RooAbsData.h" export * } -module "RooAbsDataStore.h" { header "RooAbsDataStore.h" export * } -module "RooAbsFunc.h" { header "RooAbsFunc.h" export * } -module "RooAbsGenContext.h" { header "RooAbsGenContext.h" export * } -module "RooAbsHiddenReal.h" { header "RooAbsHiddenReal.h" export * } -module "RooAbsIntegrator.h" { header "RooAbsIntegrator.h" export * } -module "RooAbsLValue.h" { header "RooAbsLValue.h" export * } -module "RooAbsMCStudyModule.h" { header "RooAbsMCStudyModule.h" export * } -module "RooAbsMoment.h" { header "RooAbsMoment.h" export * } -module "RooAbsNumGenerator.h" { header "RooAbsNumGenerator.h" export * } -module "RooAbsOptTestStatistic.h" { header "RooAbsOptTestStatistic.h" export * } -module "RooAbsPdf.h" { header "RooAbsPdf.h" export * } -module "RooAbsProxy.h" { header "RooAbsProxy.h" export * } -module "RooAbsReal.h" { header "RooAbsReal.h" export * } -module "RooAbsRealLValue.h" { header "RooAbsRealLValue.h" export * } -module "RooAbsRootFinder.h" { header "RooAbsRootFinder.h" export * } -module "RooAbsSelfCachedPdf.h" { header "RooAbsSelfCachedPdf.h" export * } -module "RooAbsSelfCachedReal.h" { header "RooAbsSelfCachedReal.h" export * } -module "RooAbsString.h" { header "RooAbsString.h" export * } -module "RooAbsStudy.h" { header "RooAbsStudy.h" export * } -module "RooAbsTestStatistic.h" { header "RooAbsTestStatistic.h" export * } -module "RooAcceptReject.h" { header "RooAcceptReject.h" export * } -module "RooAdaptiveGaussKronrodIntegrator1D.h" { header "RooAdaptiveGaussKronrodIntegrator1D.h" export * } -module "RooAdaptiveIntegratorND.h" { header "RooAdaptiveIntegratorND.h" export * } -module "RooAddGenContext.h" { header "RooAddGenContext.h" export * } -module "RooAddModel.h" { header "RooAddModel.h" export * } -module "RooAddPdf.h" { header "RooAddPdf.h" export * } -module "RooAddition.h" { header "RooAddition.h" export * } -module "RooArgList.h" { header "RooArgList.h" export * } -module "RooArgProxy.h" { header "RooArgProxy.h" export * } -module "RooArgSet.h" { header "RooArgSet.h" export * } -module "RooArgusBG.h" { header "RooArgusBG.h" export * } -module "RooBCPEffDecay.h" { header "RooBCPEffDecay.h" export * } -module "RooBCPGenDecay.h" { header "RooBCPGenDecay.h" export * } -module "RooBDecay.h" { header "RooBDecay.h" export * } -module "RooBMixDecay.h" { header "RooBMixDecay.h" export * } -module "RooBanner.h" { header "RooBanner.h" export * } -module "RooBernstein.h" { header "RooBernstein.h" export * } -module "RooBifurGauss.h" { header "RooBifurGauss.h" export * } -module "RooBinIntegrator.h" { header "RooBinIntegrator.h" export * } -module "RooBinnedGenContext.h" { header "RooBinnedGenContext.h" export * } -module "RooBinning.h" { header "RooBinning.h" export * } -module "RooBinningCategory.h" { header "RooBinningCategory.h" export * } -module "RooBlindTools.h" { header "RooBlindTools.h" export * } -module "RooBreitWigner.h" { header "RooBreitWigner.h" export * } -module "RooBrentRootFinder.h" { header "RooBrentRootFinder.h" export * } -module "RooBukinPdf.h" { header "RooBukinPdf.h" export * } -module "RooCBShape.h" { header "RooCBShape.h" export * } -module "RooCFunction1Binding.h" { header "RooCFunction1Binding.h" export * } -module "RooCFunction2Binding.h" { header "RooCFunction2Binding.h" export * } -module "RooCFunction3Binding.h" { header "RooCFunction3Binding.h" export * } -module "RooCFunction4Binding.h" { header "RooCFunction4Binding.h" export * } -module "RooCacheManager.h" { header "RooCacheManager.h" export * } -module "RooCachedPdf.h" { header "RooCachedPdf.h" export * } -module "RooCachedReal.h" { header "RooCachedReal.h" export * } -module "RooCatType.h" { header "RooCatType.h" export * } -module "RooCategory.h" { header "RooCategory.h" export * } -module "RooCategoryProxy.h" { header "RooCategoryProxy.h" export * } -module "RooCategorySharedProperties.h" { header "RooCategorySharedProperties.h" export * } -module "RooChangeTracker.h" { header "RooChangeTracker.h" export * } -module "RooChebychev.h" { header "RooChebychev.h" export * } -module "RooChi2MCSModule.h" { header "RooChi2MCSModule.h" export * } -module "RooChi2Var.h" { header "RooChi2Var.h" export * } -module "RooChiSquarePdf.h" { header "RooChiSquarePdf.h" export * } -module "RooCintUtils.h" { header "RooCintUtils.h" export * } -module "RooClassFactory.h" { header "RooClassFactory.h" export * } -module "RooCmdArg.h" { header "RooCmdArg.h" export * } -module "RooCmdConfig.h" { header "RooCmdConfig.h" export * } -module "RooComplex.h" { header "RooComplex.h" export * } -module "RooCompositeDataStore.h" { header "RooCompositeDataStore.h" export * } -module "RooConstVar.h" { header "RooConstVar.h" export * } -module "RooConstraintSum.h" { header "RooConstraintSum.h" export * } -module "RooConvCoefVar.h" { header "RooConvCoefVar.h" export * } -module "RooConvGenContext.h" { header "RooConvGenContext.h" export * } -module "RooConvIntegrandBinding.h" { header "RooConvIntegrandBinding.h" export * } -module "RooCurve.h" { header "RooCurve.h" export * } -module "RooCustomizer.h" { header "RooCustomizer.h" export * } -module "RooDLLSignificanceMCSModule.h" { header "RooDLLSignificanceMCSModule.h" export * } -module "RooDataHist.h" { header "RooDataHist.h" export * } -module "RooDataHistSliceIter.h" { header "RooDataHistSliceIter.h" export * } -module "RooDataProjBinding.h" { header "RooDataProjBinding.h" export * } -module "RooDataSet.h" { header "RooDataSet.h" export * } -module "RooDataWeightedAverage.h" { header "RooDataWeightedAverage.h" export * } -module "RooDecay.h" { header "RooDecay.h" export * } -module "RooDerivative.h" { header "RooDerivative.h" export * } -module "RooDirItem.h" { header "RooDirItem.h" export * } -module "RooDouble.h" { header "RooDouble.h" export * } -module "RooDstD0BG.h" { header "RooDstD0BG.h" export * } -module "RooEffGenContext.h" { header "RooEffGenContext.h" export * } -module "RooEffProd.h" { header "RooEffProd.h" export * } -module "RooEfficiency.h" { header "RooEfficiency.h" export * } -module "RooEllipse.h" { header "RooEllipse.h" export * } -module "RooErrorHandler.h" { header "RooErrorHandler.h" export * } -module "RooErrorVar.h" { header "RooErrorVar.h" export * } -module "RooExpensiveObjectCache.h" { header "RooExpensiveObjectCache.h" export * } -module "RooExponential.h" { header "RooExponential.h" export * } -module "RooExtendPdf.h" { header "RooExtendPdf.h" export * } -module "RooExtendedBinding.h" { header "RooExtendedBinding.h" export * } -module "RooExtendedTerm.h" { header "RooExtendedTerm.h" export * } -module "RooFFTConvPdf.h" { header "RooFFTConvPdf.h" export * } -module "RooFactoryWSTool.h" { header "RooFactoryWSTool.h" export * } -module "RooFirstMoment.h" { header "RooFirstMoment.h" export * } -module "RooFit.h" { header "RooFit.h" export * } -module "RooFitResult.h" { header "RooFitResult.h" export * } -module "RooFoamGenerator.h" { header "RooFoamGenerator.h" export * } -module "RooFormula.h" { header "RooFormula.h" export * } -module "RooFormulaVar.h" { header "RooFormulaVar.h" export * } -module "RooFracRemainder.h" { header "RooFracRemainder.h" export * } -module "RooFunctor.h" { header "RooFunctor.h" export * } -module "RooFunctor1DBinding.h" { header "RooFunctor1DBinding.h" export * } -module "RooFunctorBinding.h" { header "RooFunctorBinding.h" export * } -module "RooGExpModel.h" { header "RooGExpModel.h" export * } -module "RooGamma.h" { header "RooGamma.h" export * } -module "RooGaussKronrodIntegrator1D.h" { header "RooGaussKronrodIntegrator1D.h" export * } -module "RooGaussModel.h" { header "RooGaussModel.h" export * } -module "RooGaussian.h" { header "RooGaussian.h" export * } -module "RooGenContext.h" { header "RooGenContext.h" export * } -module "RooGenFitStudy.h" { header "RooGenFitStudy.h" export * } -module "RooGenFunction.h" { header "RooGenFunction.h" export * } -module "RooGenProdProj.h" { header "RooGenProdProj.h" export * } -module "RooGenericPdf.h" { header "RooGenericPdf.h" export * } -module "RooGlobalFunc.h" { header "RooGlobalFunc.h" export * } -module "RooGrid.h" { header "RooGrid.h" export * } -module "RooHashTable.h" { header "RooHashTable.h" export * } -module "RooHist.h" { header "RooHist.h" export * } -module "RooHistConstraint.h" { header "RooHistConstraint.h" export * } -module "RooHistError.h" { header "RooHistError.h" export * } -module "RooHistFunc.h" { header "RooHistFunc.h" export * } -module "RooHistPdf.h" { header "RooHistPdf.h" export * } -module "RooImproperIntegrator1D.h" { header "RooImproperIntegrator1D.h" export * } -module "RooInt.h" { header "RooInt.h" export * } -module "RooIntegralMorph.h" { header "RooIntegralMorph.h" export * } -module "RooIntegrator1D.h" { header "RooIntegrator1D.h" export * } -module "RooIntegrator2D.h" { header "RooIntegrator2D.h" export * } -module "RooIntegratorBinding.h" { header "RooIntegratorBinding.h" export * } -module "RooInvTransform.h" { header "RooInvTransform.h" export * } -module "RooJeffreysPrior.h" { header "RooJeffreysPrior.h" export * } -module "RooKeysPdf.h" { header "RooKeysPdf.h" export * } -module "RooLandau.h" { header "RooLandau.h" export * } -module "RooLegendre.h" { header "RooLegendre.h" export * } -module "RooLinTransBinning.h" { header "RooLinTransBinning.h" export * } -module "RooLinearVar.h" { header "RooLinearVar.h" export * } -module "RooLinkedList.h" { header "RooLinkedList.h" export * } -module "RooLinkedListElem.h" { header "RooLinkedListElem.h" export * } -module "RooLinkedListIter.h" { header "RooLinkedListIter.h" export * } -module "RooList.h" { header "RooList.h" export * } -module "RooListProxy.h" { header "RooListProxy.h" export * } -module "RooLognormal.h" { header "RooLognormal.h" export * } -module "RooMCIntegrator.h" { header "RooMCIntegrator.h" export * } -module "RooMCStudy.h" { header "RooMCStudy.h" export * } -module "RooMPSentinel.h" { header "RooMPSentinel.h" export * } -module "RooMapCatEntry.h" { header "RooMapCatEntry.h" export * } -module "RooMappedCategory.h" { header "RooMappedCategory.h" export * } -module "RooMath.h" { header "RooMath.h" export * } -module "RooMathCoreReg.h" { header "RooMathCoreReg.h" export * } -module "RooMathMoreReg.h" { header "RooMathMoreReg.h" export * } -module "RooMinimizer.h" { header "RooMinimizer.h" export * } -module "RooMinimizerFcn.h" { header "RooMinimizerFcn.h" export * } -module "RooMinuit.h" { header "RooMinuit.h" export * } -module "RooMoment.h" { header "RooMoment.h" export * } -module "RooMomentMorph.h" { header "RooMomentMorph.h" export * } -module "RooMsgService.h" { header "RooMsgService.h" export * } -module "RooMultiBinomial.h" { header "RooMultiBinomial.h" export * } -module "RooMultiCatIter.h" { header "RooMultiCatIter.h" export * } -module "RooMultiCategory.h" { header "RooMultiCategory.h" export * } -module "RooMultiGenFunction.h" { header "RooMultiGenFunction.h" export * } -module "RooMultiVarGaussian.h" { header "RooMultiVarGaussian.h" export * } -module "RooNDKeysPdf.h" { header "RooNDKeysPdf.h" export * } -module "RooNLLVar.h" { header "RooNLLVar.h" export * } -module "RooNameReg.h" { header "RooNameReg.h" export * } -module "RooNameSet.h" { header "RooNameSet.h" export * } -module "RooNonCPEigenDecay.h" { header "RooNonCPEigenDecay.h" export * } -module "RooNonCentralChiSquare.h" { header "RooNonCentralChiSquare.h" export * } -module "RooNormSetCache.h" { header "RooNormSetCache.h" export * } -module "RooNovosibirsk.h" { header "RooNovosibirsk.h" export * } -module "RooNumCdf.h" { header "RooNumCdf.h" export * } -module "RooNumConvPdf.h" { header "RooNumConvPdf.h" export * } -module "RooNumConvolution.h" { header "RooNumConvolution.h" export * } -module "RooNumGenConfig.h" { header "RooNumGenConfig.h" export * } -module "RooNumGenFactory.h" { header "RooNumGenFactory.h" export * } -module "RooNumIntConfig.h" { header "RooNumIntConfig.h" export * } -module "RooNumIntFactory.h" { header "RooNumIntFactory.h" export * } -module "RooNumRunningInt.h" { header "RooNumRunningInt.h" export * } -module "RooNumber.h" { header "RooNumber.h" export * } -module "RooObjCacheManager.h" { header "RooObjCacheManager.h" export * } -module "RooParamBinning.h" { header "RooParamBinning.h" export * } -module "RooParamHistFunc.h" { header "RooParamHistFunc.h" export * } -module "RooParametricStepFunction.h" { header "RooParametricStepFunction.h" export * } -module "RooPlot.h" { header "RooPlot.h" export * } -module "RooPlotable.h" { header "RooPlotable.h" export * } -module "RooPoisson.h" { header "RooPoisson.h" export * } -module "RooPolyVar.h" { header "RooPolyVar.h" export * } -module "RooPolynomial.h" { header "RooPolynomial.h" export * } -module "RooPrintable.h" { header "RooPrintable.h" export * } -module "RooProdGenContext.h" { header "RooProdGenContext.h" export * } -module "RooProdPdf.h" { header "RooProdPdf.h" export * } -module "RooProduct.h" { header "RooProduct.h" export * } -module "RooProfileLL.h" { header "RooProfileLL.h" export * } -module "RooProjectedPdf.h" { header "RooProjectedPdf.h" export * } -module "RooProofDriverSelector.h" { header "RooProofDriverSelector.h" export * } -module "RooPullVar.h" { header "RooPullVar.h" export * } -module "RooQuasiRandomGenerator.h" { header "RooQuasiRandomGenerator.h" export * } -module "RooRandom.h" { header "RooRandom.h" export * } -module "RooRandomizeParamMCSModule.h" { header "RooRandomizeParamMCSModule.h" export * } -module "RooRangeBinning.h" { header "RooRangeBinning.h" export * } -module "RooRangeBoolean.h" { header "RooRangeBoolean.h" export * } -module "RooRealAnalytic.h" { header "RooRealAnalytic.h" export * } -module "RooRealBinding.h" { header "RooRealBinding.h" export * } -module "RooRealConstant.h" { header "RooRealConstant.h" export * } -module "RooRealIntegral.h" { header "RooRealIntegral.h" export * } -module "RooRealMPFE.h" { header "RooRealMPFE.h" export * } -module "RooRealProxy.h" { header "RooRealProxy.h" export * } -module "RooRealSumPdf.h" { header "RooRealSumPdf.h" export * } -module "RooRealVar.h" { header "RooRealVar.h" export * } -module "RooRealVarSharedProperties.h" { header "RooRealVarSharedProperties.h" export * } -module "RooRecursiveFraction.h" { header "RooRecursiveFraction.h" export * } -module "RooRefCountList.h" { header "RooRefCountList.h" export * } -module "RooResolutionModel.h" { header "RooResolutionModel.h" export * } -module "RooScaledFunc.h" { header "RooScaledFunc.h" export * } -module "RooSecondMoment.h" { header "RooSecondMoment.h" export * } -module "RooSegmentedIntegrator1D.h" { header "RooSegmentedIntegrator1D.h" export * } -module "RooSegmentedIntegrator2D.h" { header "RooSegmentedIntegrator2D.h" export * } -module "RooSentinel.h" { header "RooSentinel.h" export * } -module "RooSetPair.h" { header "RooSetPair.h" export * } -module "RooSetProxy.h" { header "RooSetProxy.h" export * } -module "RooSharedProperties.h" { header "RooSharedProperties.h" export * } -module "RooSharedPropertiesList.h" { header "RooSharedPropertiesList.h" export * } -module "RooSimGenContext.h" { header "RooSimGenContext.h" export * } -module "RooSimPdfBuilder.h" { header "RooSimPdfBuilder.h" export * } -module "RooSimSplitGenContext.h" { header "RooSimSplitGenContext.h" export * } -module "RooSimWSTool.h" { header "RooSimWSTool.h" export * } -module "RooSimultaneous.h" { header "RooSimultaneous.h" export * } -module "RooSpHarmonic.h" { header "RooSpHarmonic.h" export * } -module "RooStats/AsymptoticCalculator.h" { header "RooStats/AsymptoticCalculator.h" export * } -module "RooStats/BayesianCalculator.h" { header "RooStats/BayesianCalculator.h" export * } -module "RooStats/BernsteinCorrection.h" { header "RooStats/BernsteinCorrection.h" export * } -module "RooStats/CombinedCalculator.h" { header "RooStats/CombinedCalculator.h" export * } -module "RooStats/ConfInterval.h" { header "RooStats/ConfInterval.h" export * } -module "RooStats/ConfidenceBelt.h" { header "RooStats/ConfidenceBelt.h" export * } -module "RooStats/DebuggingSampler.h" { header "RooStats/DebuggingSampler.h" export * } -module "RooStats/DebuggingTestStat.h" { header "RooStats/DebuggingTestStat.h" export * } -module "RooStats/DetailedOutputAggregator.h" { header "RooStats/DetailedOutputAggregator.h" export * } -module "RooStats/FeldmanCousins.h" { header "RooStats/FeldmanCousins.h" export * } -module "RooStats/FrequentistCalculator.h" { header "RooStats/FrequentistCalculator.h" export * } -module "RooStats/HLFactory.h" { header "RooStats/HLFactory.h" export * } -module "RooStats/Heaviside.h" { header "RooStats/Heaviside.h" export * } -module "RooStats/HistFactory/Asimov.h" { header "RooStats/HistFactory/Asimov.h" export * } -module "RooStats/HistFactory/Channel.h" { header "RooStats/HistFactory/Channel.h" export * } -module "RooStats/HistFactory/ConfigParser.h" { header "RooStats/HistFactory/ConfigParser.h" export * } -module "RooStats/HistFactory/Data.h" { header "RooStats/HistFactory/Data.h" export * } -module "RooStats/HistFactory/EstimateSummary.h" { header "RooStats/HistFactory/EstimateSummary.h" export * } -module "RooStats/HistFactory/FlexibleInterpVar.h" { header "RooStats/HistFactory/FlexibleInterpVar.h" export * } -module "RooStats/HistFactory/HistFactoryException.h" { header "RooStats/HistFactory/HistFactoryException.h" export * } -module "RooStats/HistFactory/HistFactoryModelUtils.h" { header "RooStats/HistFactory/HistFactoryModelUtils.h" export * } -module "RooStats/HistFactory/HistFactoryNavigation.h" { header "RooStats/HistFactory/HistFactoryNavigation.h" export * } -module "RooStats/HistFactory/HistFactorySimultaneous.h" { header "RooStats/HistFactory/HistFactorySimultaneous.h" export * } -module "RooStats/HistFactory/HistRef.h" { header "RooStats/HistFactory/HistRef.h" export * } -module "RooStats/HistFactory/HistoToWorkspaceFactory.h" { header "RooStats/HistFactory/HistoToWorkspaceFactory.h" export * } -module "RooStats/HistFactory/HistoToWorkspaceFactoryFast.h" { header "RooStats/HistFactory/HistoToWorkspaceFactoryFast.h" export * } -module "RooStats/HistFactory/LinInterpVar.h" { header "RooStats/HistFactory/LinInterpVar.h" export * } -module "RooStats/HistFactory/MakeModelAndMeasurementsFast.h" { header "RooStats/HistFactory/MakeModelAndMeasurementsFast.h" export * } -module "RooStats/HistFactory/Measurement.h" { header "RooStats/HistFactory/Measurement.h" export * } -module "RooStats/HistFactory/ParamHistFunc.h" { header "RooStats/HistFactory/ParamHistFunc.h" export * } -module "RooStats/HistFactory/PiecewiseInterpolation.h" { header "RooStats/HistFactory/PiecewiseInterpolation.h" export * } -module "RooStats/HistFactory/PreprocessFunction.h" { header "RooStats/HistFactory/PreprocessFunction.h" export * } -module "RooStats/HistFactory/RooBarlowBeestonLL.h" { header "RooStats/HistFactory/RooBarlowBeestonLL.h" export * } -module "RooStats/HistFactory/Sample.h" { header "RooStats/HistFactory/Sample.h" export * } -module "RooStats/HistFactory/Systematics.h" { header "RooStats/HistFactory/Systematics.h" export * } -module "RooStats/HybridCalculator.h" { header "RooStats/HybridCalculator.h" export * } -module "RooStats/HybridCalculatorOriginal.h" { header "RooStats/HybridCalculatorOriginal.h" export * } -module "RooStats/HybridPlot.h" { header "RooStats/HybridPlot.h" export * } -module "RooStats/HybridResult.h" { header "RooStats/HybridResult.h" export * } -module "RooStats/HypoTestCalculator.h" { header "RooStats/HypoTestCalculator.h" export * } -module "RooStats/HypoTestCalculatorGeneric.h" { header "RooStats/HypoTestCalculatorGeneric.h" export * } -module "RooStats/HypoTestInverter.h" { header "RooStats/HypoTestInverter.h" export * } -module "RooStats/HypoTestInverterOriginal.h" { header "RooStats/HypoTestInverterOriginal.h" export * } -module "RooStats/HypoTestInverterPlot.h" { header "RooStats/HypoTestInverterPlot.h" export * } -module "RooStats/HypoTestInverterResult.h" { header "RooStats/HypoTestInverterResult.h" export * } -module "RooStats/HypoTestPlot.h" { header "RooStats/HypoTestPlot.h" export * } -module "RooStats/HypoTestResult.h" { header "RooStats/HypoTestResult.h" export * } -module "RooStats/IntervalCalculator.h" { header "RooStats/IntervalCalculator.h" export * } -module "RooStats/LikelihoodInterval.h" { header "RooStats/LikelihoodInterval.h" export * } -module "RooStats/LikelihoodIntervalPlot.h" { header "RooStats/LikelihoodIntervalPlot.h" export * } -module "RooStats/MCMCCalculator.h" { header "RooStats/MCMCCalculator.h" export * } -module "RooStats/MCMCInterval.h" { header "RooStats/MCMCInterval.h" export * } -module "RooStats/MCMCIntervalPlot.h" { header "RooStats/MCMCIntervalPlot.h" export * } -module "RooStats/MarkovChain.h" { header "RooStats/MarkovChain.h" export * } -module "RooStats/MaxLikelihoodEstimateTestStat.h" { header "RooStats/MaxLikelihoodEstimateTestStat.h" export * } -module "RooStats/MetropolisHastings.h" { header "RooStats/MetropolisHastings.h" export * } -module "RooStats/MinNLLTestStat.h" { header "RooStats/MinNLLTestStat.h" export * } -module "RooStats/ModelConfig.h" { header "RooStats/ModelConfig.h" export * } -module "RooStats/NeymanConstruction.h" { header "RooStats/NeymanConstruction.h" export * } -module "RooStats/NumEventsTestStat.h" { header "RooStats/NumEventsTestStat.h" export * } -module "RooStats/NumberCountingPdfFactory.h" { header "RooStats/NumberCountingPdfFactory.h" export * } -module "RooStats/NumberCountingUtils.h" { header "RooStats/NumberCountingUtils.h" export * } -module "RooStats/PdfProposal.h" { header "RooStats/PdfProposal.h" export * } -module "RooStats/PointSetInterval.h" { header "RooStats/PointSetInterval.h" export * } -module "RooStats/ProfileInspector.h" { header "RooStats/ProfileInspector.h" export * } -module "RooStats/ProfileLikelihoodCalculator.h" { header "RooStats/ProfileLikelihoodCalculator.h" export * } -module "RooStats/ProfileLikelihoodTestStat.h" { header "RooStats/ProfileLikelihoodTestStat.h" export * } -module "RooStats/ProofConfig.h" { header "RooStats/ProofConfig.h" export * } -module "RooStats/ProposalFunction.h" { header "RooStats/ProposalFunction.h" export * } -module "RooStats/ProposalHelper.h" { header "RooStats/ProposalHelper.h" export * } -module "RooStats/RatioOfProfiledLikelihoodsTestStat.h" { header "RooStats/RatioOfProfiledLikelihoodsTestStat.h" export * } -module "RooStats/RooStatsUtils.h" { header "RooStats/RooStatsUtils.h" export * } -module "RooStats/SPlot.h" { header "RooStats/SPlot.h" export * } -module "RooStats/SamplingDistPlot.h" { header "RooStats/SamplingDistPlot.h" export * } -module "RooStats/SamplingDistribution.h" { header "RooStats/SamplingDistribution.h" export * } -module "RooStats/SequentialProposal.h" { header "RooStats/SequentialProposal.h" export * } -module "RooStats/SimpleInterval.h" { header "RooStats/SimpleInterval.h" export * } -module "RooStats/SimpleLikelihoodRatioTestStat.h" { header "RooStats/SimpleLikelihoodRatioTestStat.h" export * } -module "RooStats/TestStatSampler.h" { header "RooStats/TestStatSampler.h" export * } -module "RooStats/TestStatistic.h" { header "RooStats/TestStatistic.h" export * } -module "RooStats/ToyMCImportanceSampler.h" { header "RooStats/ToyMCImportanceSampler.h" export * } -module "RooStats/ToyMCSampler.h" { header "RooStats/ToyMCSampler.h" export * } -module "RooStats/ToyMCStudy.h" { header "RooStats/ToyMCStudy.h" export * } -module "RooStats/UniformProposal.h" { header "RooStats/UniformProposal.h" export * } -module "RooStats/UpperLimitMCSModule.h" { header "RooStats/UpperLimitMCSModule.h" export * } -module "RooStepFunction.h" { header "RooStepFunction.h" export * } -module "RooStreamParser.h" { header "RooStreamParser.h" export * } -module "RooStringVar.h" { header "RooStringVar.h" export * } -module "RooStudyManager.h" { header "RooStudyManager.h" export * } -module "RooStudyPackage.h" { header "RooStudyPackage.h" export * } -module "RooSuperCategory.h" { header "RooSuperCategory.h" export * } -module "RooTFnBinding.h" { header "RooTFnBinding.h" export * } -module "RooTFnPdfBinding.h" { header "RooTFnPdfBinding.h" export * } -module "RooTFoamBinding.h" { header "RooTFoamBinding.h" export * } -module "RooTMathReg.h" { header "RooTMathReg.h" export * } -module "RooTObjWrap.h" { header "RooTObjWrap.h" export * } -module "RooTable.h" { header "RooTable.h" export * } -module "RooThreshEntry.h" { header "RooThreshEntry.h" export * } -module "RooThresholdCategory.h" { header "RooThresholdCategory.h" export * } -module "RooTrace.h" { header "RooTrace.h" export * } -module "RooTreeData.h" { header "RooTreeData.h" export * } -module "RooTreeDataStore.h" { header "RooTreeDataStore.h" export * } -module "RooTruthModel.h" { header "RooTruthModel.h" export * } -module "RooUnblindCPAsymVar.h" { header "RooUnblindCPAsymVar.h" export * } -module "RooUnblindOffset.h" { header "RooUnblindOffset.h" export * } -module "RooUnblindPrecision.h" { header "RooUnblindPrecision.h" export * } -module "RooUnblindUniform.h" { header "RooUnblindUniform.h" export * } -module "RooUniform.h" { header "RooUniform.h" export * } -module "RooUniformBinning.h" { header "RooUniformBinning.h" export * } -module "RooUnitTest.h" { header "RooUnitTest.h" export * } -module "RooVectorDataStore.h" { header "RooVectorDataStore.h" export * } -module "RooVoigtian.h" { header "RooVoigtian.h" export * } -module "RooWorkspace.h" { header "RooWorkspace.h" export * } -module "RooXYChi2Var.h" { header "RooXYChi2Var.h" export * } -module "RootMetaSelection.h" { header "RootMetaSelection.h" export * } -module "Rpair.h" { header "Rpair.h" export * } -module "Rstrstream.h" { header "Rstrstream.h" export * } -module "Rtypeinfo.h" { header "Rtypeinfo.h" export * } -module "Rtypes.h" { - // Cyclic dependency Rtypes.h -> TGenericClassInfo.h -> Rtypes.h - header "Rtypes.h" - header "TGenericClassInfo.h" + +// This can be used in C mode. It cannot go in ROOT_Type because ThreadLocalStorage.h +// uses kFALSE and kTRUE, which come from Rtypes.h causing a cycle. +module ThreadLocalStorage { + header "ThreadLocalStorage.h" export * } - -module "RtypesCore.h" { header "RtypesCore.h" export * } -//module "RtypesImp.h" { header "RtypesImp.h" export * } -- should be included only from dictionaries, i.e. if G__DICTIONARY is defined -module "Strlen.h" { header "Strlen.h" export * } -module "TASImage.h" { header "TASImage.h" export * } -module "TASImagePlugin.h" { header "TASImagePlugin.h" export * } -module "TASPaletteEditor.h" { header "TASPaletteEditor.h" export * } -module "TASPluginGS.h" { header "TASPluginGS.h" export * } -module "TAdvancedGraphicsDialog.h" { header "TAdvancedGraphicsDialog.h" export * } -module "TApplication.h" { header "TApplication.h" export * } -module "TApplicationImp.h" { header "TApplicationImp.h" export * } -module "TApplicationRemote.h" { header "TApplicationRemote.h" export * } -module "TApplicationServer.h" { header "TApplicationServer.h" export * } -module "TArc.h" { header "TArc.h" export * } -module "TArcBall.h" { header "TArcBall.h" export * } -module "TArchiveFile.h" { header "TArchiveFile.h" export * } -module "TArray.h" { header "TArray.h" export * } -module "TArrayC.h" { header "TArrayC.h" export * } -module "TArrayD.h" { header "TArrayD.h" export * } -module "TArrayF.h" { header "TArrayF.h" export * } -module "TArrayI.h" { header "TArrayI.h" export * } -module "TArrayL.h" { header "TArrayL.h" export * } -module "TArrayL64.h" { header "TArrayL64.h" export * } -module "TArrayS.h" { header "TArrayS.h" export * } -module "TArrow.h" { header "TArrow.h" export * } -module "TArrowEditor.h" { header "TArrowEditor.h" export * } -module "TAtomicCount.h" { header "TAtomicCount.h" export * } -module "TAtomicCountGcc.h" { header "TAtomicCountGcc.h" export * } -module "TAtomicCountPthread.h" { header "TAtomicCountPthread.h" export * } -module "TAtt3D.h" { header "TAtt3D.h" export * } -module "TAttAxis.h" { header "TAttAxis.h" export * } -module "TAttBBox.h" { header "TAttBBox.h" export * } -module "TAttBBox2D.h" { header "TAttBBox2D.h" export * } -module "TAttCanvas.h" { header "TAttCanvas.h" export * } -module "TAttFill.h" { header "TAttFill.h" export * } -module "TAttFillEditor.h" { header "TAttFillEditor.h" export * } -module "TAttImage.h" { header "TAttImage.h" export * } -module "TAttLine.h" { header "TAttLine.h" export * } -module "TAttLineEditor.h" { header "TAttLineEditor.h" export * } -module "TAttMarker.h" { header "TAttMarker.h" export * } -module "TAttMarkerEditor.h" { header "TAttMarkerEditor.h" export * } -module "TAttPad.h" { header "TAttPad.h" export * } -module "TAttParticle.h" { header "TAttParticle.h" export * } -module "TAttText.h" { header "TAttText.h" export * } -module "TAttTextEditor.h" { header "TAttTextEditor.h" export * } -module "TAuthenticate.h" { header "TAuthenticate.h" export * } -module "TAxis.h" { header "TAxis.h" export * } -module "TAxis3D.h" { header "TAxis3D.h" export * } -module "TAxisEditor.h" { header "TAxisEditor.h" export * } -module "TBRIK.h" { header "TBRIK.h" export * } -module "TBackCompFitter.h" { header "TBackCompFitter.h" export * } -module "TBase64.h" { header "TBase64.h" export * } -module "TBaseClass.h" { header "TBaseClass.h" export * } -module "TBasket.h" { header "TBasket.h" export * } -module "TBasketSQL.h" { header "TBasketSQL.h" export * } -module "TBenchmark.h" { header "TBenchmark.h" export * } -module "TBinomialEfficiencyFitter.h" { header "TBinomialEfficiencyFitter.h" export * } -module "TBits.h" { header "TBits.h" export * } -module "TBonjourBrowser.h" { header "TBonjourBrowser.h" export * } -module "TBonjourRecord.h" { header "TBonjourRecord.h" export * } -module "TBonjourRegistrar.h" { header "TBonjourRegistrar.h" export * } -module "TBonjourResolver.h" { header "TBonjourResolver.h" export * } -module "TBox.h" { header "TBox.h" export * } -module "TBranch.h" { header "TBranch.h" export * } -module "TBranchBrowsable.h" { header "TBranchBrowsable.h" export * } -module "TBranchClones.h" { header "TBranchClones.h" export * } -module "TBranchElement.h" { header "TBranchElement.h" export * } -module "TBranchObject.h" { header "TBranchObject.h" export * } -module "TBranchProxy.h" { header "TBranchProxy.h" export * } -module "TBranchProxyClassDescriptor.h" { header "TBranchProxyClassDescriptor.h" export * } -module "TBranchProxyDescriptor.h" { header "TBranchProxyDescriptor.h" export * } -module "TBranchProxyDirector.h" { header "TBranchProxyDirector.h" export * } -// TBranchProxyTemplate.h checks for R__BRANCHPROXY_GENERATOR_VERSION thus it -// cannot be modularized. -module "TBranchProxyTemplate.h" { - textual header "TBranchProxyTemplate.h" +// These can be used in C mode. +module ROOT_Types { + header "RtypesCore.h" + textual header "RConfig.h" + textual header "RVersion.h" + textual header "TException.h" // This should go in RConfig.h as it defines macros. export * } -module "TBranchRef.h" { header "TBranchRef.h" export * } -module "TBranchSTL.h" { header "TBranchSTL.h" export * } -module "TBrowser.h" { header "TBrowser.h" export * } -module "TBrowserImp.h" { header "TBrowserImp.h" export * } -module "TBtree.h" { header "TBtree.h" export * } -module "TBuffer.h" { header "TBuffer.h" export * } -module "TBuffer3D.h" { header "TBuffer3D.h" export * } -module "TBuffer3DTypes.h" { header "TBuffer3DTypes.h" export * } -module "TBufferFile.h" { header "TBufferFile.h" export * } -module "TBufferJSON.h" { header "TBufferJSON.h" export * } -module "TBufferSQL.h" { header "TBufferSQL.h" export * } -module "TBufferSQL2.h" { header "TBufferSQL2.h" export * } -module "TBufferXML.h" { header "TBufferXML.h" export * } -module "TButton.h" { header "TButton.h" export * } -module "TCONE.h" { header "TCONE.h" export * } -module "TCONS.h" { header "TCONS.h" export * } -module "TCTUB.h" { header "TCTUB.h" export * } -module "TCanvas.h" { header "TCanvas.h" export * } -module "TCanvasImp.h" { header "TCanvasImp.h" export * } -module "TCernLib.h" { header "TCernLib.h" export * } -module "TChain.h" { header "TChain.h" export * } -module "TChainElement.h" { header "TChainElement.h" export * } -module "TChainIndex.h" { header "TChainIndex.h" export * } -module "TChair.h" { header "TChair.h" export * } -module "TCivetweb.h" { header "TCivetweb.h" export * } -module "TClass.h" { header "TClass.h" export * } -module "TClassDocOutput.h" { header "TClassDocOutput.h" export * } -module "TClassEdit.h" { header "TClassEdit.h" export * } -module "TClassGenerator.h" { header "TClassGenerator.h" export * } -module "TClassMenuItem.h" { header "TClassMenuItem.h" export * } -module "TClassRef.h" { header "TClassRef.h" export * } -module "TClassStreamer.h" { header "TClassStreamer.h" export * } -module "TClassTable.h" { header "TClassTable.h" export * } -module "TClassTree.h" { header "TClassTree.h" export * } -module "TClingRuntime.h" { header "TClingRuntime.h" export * } -module "TClonesArray.h" { header "TClonesArray.h" export * } -module "TCollection.h" { header "TCollection.h" export * } -module "TCollectionProxyFactory.h" { header "TCollectionProxyFactory.h" export * } -module "TCollectionProxyInfo.h" { header "TCollectionProxyInfo.h" export * } -module "TColor.h" { header "TColor.h" export * } -module "TColorGradient.h" { header "TColorGradient.h" export * } -module "TColorWheel.h" { header "TColorWheel.h" export * } -module "TColumnView.h" { header "TColumnView.h" export * } -module "TComplex.h" { header "TComplex.h" export * } -module "TCondition.h" { header "TCondition.h" export * } -module "TConditionImp.h" { header "TConditionImp.h" export * } -module "TCondor.h" { header "TCondor.h" export * } -module "TConfidenceLevel.h" { header "TConfidenceLevel.h" export * } -module "TContainerConverters.h" { header "TContainerConverters.h" export * } -module "TContextMenu.h" { header "TContextMenu.h" export * } -module "TContextMenuImp.h" { header "TContextMenuImp.h" export * } -module "TControlBar.h" { header "TControlBar.h" export * } -module "TControlBarButton.h" { header "TControlBarButton.h" export * } -module "TControlBarImp.h" { header "TControlBarImp.h" export * } -module "TCreatePrimitives.h" { header "TCreatePrimitives.h" export * } -module "TCrown.h" { header "TCrown.h" export * } -module "TCurlyArc.h" { header "TCurlyArc.h" export * } -module "TCurlyArcEditor.h" { header "TCurlyArcEditor.h" export * } -module "TCurlyLine.h" { header "TCurlyLine.h" export * } -module "TCurlyLineEditor.h" { header "TCurlyLineEditor.h" export * } -module "TCut.h" { header "TCut.h" export * } -module "TCutG.h" { header "TCutG.h" export * } -module "TDOMParser.h" { header "TDOMParser.h" export * } -module "TDSet.h" { header "TDSet.h" export * } -module "TDSetProxy.h" { header "TDSetProxy.h" export * } -module "TDataMember.h" { header "TDataMember.h" export * } -module "TDataSet.h" { header "TDataSet.h" export * } -module "TDataSetIter.h" { header "TDataSetIter.h" export * } -module "TDataSetManager.h" { header "TDataSetManager.h" export * } -module "TDataSetManagerAliEn.h" { header "TDataSetManagerAliEn.h" export * } -module "TDataSetManagerFile.h" { header "TDataSetManagerFile.h" export * } -module "TDataType.h" { header "TDataType.h" export * } -module "TDatabasePDG.h" { header "TDatabasePDG.h" export * } -module "TDatime.h" { header "TDatime.h" export * } -module "TDecayChannel.h" { header "TDecayChannel.h" export * } -module "TDecompBK.h" { header "TDecompBK.h" export * } -module "TDecompBase.h" { header "TDecompBase.h" export * } -module "TDecompChol.h" { header "TDecompChol.h" export * } -module "TDecompLU.h" { header "TDecompLU.h" export * } -module "TDecompQRH.h" { header "TDecompQRH.h" export * } -module "TDecompSVD.h" { header "TDecompSVD.h" export * } -module "TDecompSparse.h" { header "TDecompSparse.h" export * } -module "TDialogCanvas.h" { header "TDialogCanvas.h" export * } -module "TDiamond.h" { header "TDiamond.h" export * } -module "TDictAttributeMap.h" { header "TDictAttributeMap.h" export * } -module "TDictionary.h" { header "TDictionary.h" export * } -module "TDirectory.h" { header "TDirectory.h" export * } -module "TDirectoryFile.h" { header "TDirectoryFile.h" export * } -module "TDocDirective.h" { header "TDocDirective.h" export * } -module "TDocInfo.h" { header "TDocInfo.h" export * } -module "TDocOutput.h" { header "TDocOutput.h" export * } -module "TDocParser.h" { header "TDocParser.h" export * } -module "TDrawFeedback.h" { header "TDrawFeedback.h" export * } -module "TDsKey.h" { header "TDsKey.h" export * } -module "TELTU.h" { header "TELTU.h" export * } -module "TEfficiency.h" { header "TEfficiency.h" export * } -module "TEllipse.h" { header "TEllipse.h" export * } -module "TEmulatedCollectionProxy.h" { header "TEmulatedCollectionProxy.h" export * } -module "TEmulatedMapProxy.h" { header "TEmulatedMapProxy.h" export * } -module "TEntryList.h" { header "TEntryList.h" export * } -module "TEntryListArray.h" { header "TEntryListArray.h" export * } -module "TEntryListBlock.h" { header "TEntryListBlock.h" export * } -module "TEntryListFromFile.h" { header "TEntryListFromFile.h" export * } -module "TEnum.h" { header "TEnum.h" export * } -module "TEnumConstant.h" { header "TEnumConstant.h" export * } -module "TEnv.h" { header "TEnv.h" export * } -module "TError.h" { header "TError.h" export * } -module "TEveArrow.h" { header "TEveArrow.h" export * } -module "TEveArrowEditor.h" { header "TEveArrowEditor.h" export * } -module "TEveArrowGL.h" { header "TEveArrowGL.h" export * } -module "TEveBox.h" { header "TEveBox.h" export * } -module "TEveBoxGL.h" { header "TEveBoxGL.h" export * } -module "TEveBoxSet.h" { header "TEveBoxSet.h" export * } -module "TEveBoxSetGL.h" { header "TEveBoxSetGL.h" export * } -module "TEveBrowser.h" { header "TEveBrowser.h" export * } -module "TEveCalo.h" { header "TEveCalo.h" export * } -module "TEveCalo2DGL.h" { header "TEveCalo2DGL.h" export * } -module "TEveCalo3DGL.h" { header "TEveCalo3DGL.h" export * } -module "TEveCaloData.h" { header "TEveCaloData.h" export * } -module "TEveCaloLegoEditor.h" { header "TEveCaloLegoEditor.h" export * } -module "TEveCaloLegoGL.h" { header "TEveCaloLegoGL.h" export * } -module "TEveCaloLegoOverlay.h" { header "TEveCaloLegoOverlay.h" export * } -module "TEveCaloVizEditor.h" { header "TEveCaloVizEditor.h" export * } -module "TEveChunkManager.h" { header "TEveChunkManager.h" export * } -module "TEveCompound.h" { header "TEveCompound.h" export * } -module "TEveDigitSet.h" { header "TEveDigitSet.h" export * } -module "TEveDigitSetEditor.h" { header "TEveDigitSetEditor.h" export * } -module "TEveDigitSetGL.h" { header "TEveDigitSetGL.h" export * } -module "TEveElement.h" { header "TEveElement.h" export * } -module "TEveElementEditor.h" { header "TEveElementEditor.h" export * } -module "TEveEventManager.h" { header "TEveEventManager.h" export * } -module "TEveFrameBox.h" { header "TEveFrameBox.h" export * } -module "TEveFrameBoxGL.h" { header "TEveFrameBoxGL.h" export * } -module "TEveGValuators.h" { header "TEveGValuators.h" export * } -module "TEveGedEditor.h" { header "TEveGedEditor.h" export * } -module "TEveGeoNode.h" { header "TEveGeoNode.h" export * } -module "TEveGeoNodeEditor.h" { header "TEveGeoNodeEditor.h" export * } -module "TEveGeoPolyShape.h" { header "TEveGeoPolyShape.h" export * } -module "TEveGeoShape.h" { header "TEveGeoShape.h" export * } -module "TEveGeoShapeExtract.h" { header "TEveGeoShapeExtract.h" export * } -module "TEveGridStepper.h" { header "TEveGridStepper.h" export * } -module "TEveGridStepperEditor.h" { header "TEveGridStepperEditor.h" export * } -module "TEveJetCone.h" { header "TEveJetCone.h" export * } -module "TEveJetConeEditor.h" { header "TEveJetConeEditor.h" export * } -module "TEveJetConeGL.h" { header "TEveJetConeGL.h" export * } -module "TEveLegoEventHandler.h" { header "TEveLegoEventHandler.h" export * } -module "TEveLine.h" { header "TEveLine.h" export * } -module "TEveLineEditor.h" { header "TEveLineEditor.h" export * } -module "TEveLineGL.h" { header "TEveLineGL.h" export * } -module "TEveMacro.h" { header "TEveMacro.h" export * } -module "TEveManager.h" { header "TEveManager.h" export * } -module "TEvePad.h" { header "TEvePad.h" export * } -module "TEveParamList.h" { header "TEveParamList.h" export * } -module "TEvePathMark.h" { header "TEvePathMark.h" export * } -module "TEvePlot3D.h" { header "TEvePlot3D.h" export * } -module "TEvePlot3DGL.h" { header "TEvePlot3DGL.h" export * } -module "TEvePointSet.h" { header "TEvePointSet.h" export * } -module "TEvePointSetArrayEditor.h" { header "TEvePointSetArrayEditor.h" export * } -module "TEvePolygonSetProjected.h" { header "TEvePolygonSetProjected.h" export * } -module "TEvePolygonSetProjectedGL.h" { header "TEvePolygonSetProjectedGL.h" export * } -module "TEveProjectionAxes.h" { header "TEveProjectionAxes.h" export * } -module "TEveProjectionAxesEditor.h" { header "TEveProjectionAxesEditor.h" export * } -module "TEveProjectionAxesGL.h" { header "TEveProjectionAxesGL.h" export * } -module "TEveProjectionBases.h" { header "TEveProjectionBases.h" export * } -module "TEveProjectionManager.h" { header "TEveProjectionManager.h" export * } -module "TEveProjectionManagerEditor.h" { header "TEveProjectionManagerEditor.h" export * } -module "TEveProjections.h" { header "TEveProjections.h" export * } -module "TEveQuadSet.h" { header "TEveQuadSet.h" export * } -module "TEveQuadSetGL.h" { header "TEveQuadSetGL.h" export * } -module "TEveRGBAPalette.h" { header "TEveRGBAPalette.h" export * } -module "TEveRGBAPaletteEditor.h" { header "TEveRGBAPaletteEditor.h" export * } -module "TEveRGBAPaletteOverlay.h" { header "TEveRGBAPaletteOverlay.h" export * } -module "TEveScalableStraightLineSet.h" { header "TEveScalableStraightLineSet.h" export * } -module "TEveScene.h" { header "TEveScene.h" export * } -module "TEveSceneInfo.h" { header "TEveSceneInfo.h" export * } -module "TEveSecondarySelectable.h" { header "TEveSecondarySelectable.h" export * } -module "TEveSelection.h" { header "TEveSelection.h" export * } -module "TEveShape.h" { header "TEveShape.h" export * } -module "TEveShapeEditor.h" { header "TEveShapeEditor.h" export * } -module "TEveStraightLineSet.h" { header "TEveStraightLineSet.h" export * } -module "TEveStraightLineSetEditor.h" { header "TEveStraightLineSetEditor.h" export * } -module "TEveStraightLineSetGL.h" { header "TEveStraightLineSetGL.h" export * } -module "TEveText.h" { header "TEveText.h" export * } -module "TEveTextEditor.h" { header "TEveTextEditor.h" export * } -module "TEveTextGL.h" { header "TEveTextGL.h" export * } -module "TEveTrack.h" { header "TEveTrack.h" export * } -module "TEveTrackEditor.h" { header "TEveTrackEditor.h" export * } -module "TEveTrackGL.h" { header "TEveTrackGL.h" export * } -module "TEveTrackProjected.h" { header "TEveTrackProjected.h" export * } -module "TEveTrackProjectedGL.h" { header "TEveTrackProjectedGL.h" export * } -module "TEveTrackPropagator.h" { header "TEveTrackPropagator.h" export * } -module "TEveTrackPropagatorEditor.h" { header "TEveTrackPropagatorEditor.h" export * } -module "TEveTrans.h" { header "TEveTrans.h" export * } -module "TEveTransEditor.h" { header "TEveTransEditor.h" export * } -module "TEveTreeTools.h" { header "TEveTreeTools.h" export * } -module "TEveTriangleSet.h" { header "TEveTriangleSet.h" export * } -module "TEveTriangleSetEditor.h" { header "TEveTriangleSetEditor.h" export * } -module "TEveTriangleSetGL.h" { header "TEveTriangleSetGL.h" export * } -module "TEveUtil.h" { header "TEveUtil.h" export * } -module "TEveVSD.h" { header "TEveVSD.h" export * } -module "TEveVSDStructs.h" { header "TEveVSDStructs.h" export * } -module "TEveVector.h" { header "TEveVector.h" export * } -module "TEveViewer.h" { header "TEveViewer.h" export * } -module "TEveViewerListEditor.h" { header "TEveViewerListEditor.h" export * } -module "TEveWindow.h" { header "TEveWindow.h" export * } -module "TEveWindowEditor.h" { header "TEveWindowEditor.h" export * } -module "TEveWindowManager.h" { header "TEveWindowManager.h" export * } -module "TEventIter.h" { header "TEventIter.h" export * } -module "TEventList.h" { header "TEventList.h" export * } -module "TExMap.h" { header "TExMap.h" export * } -module "TException.h" { header "TException.h" export * } -module "TExec.h" { header "TExec.h" export * } -module "TF1.h" { header "TF1.h" export * } -module "TF12.h" { header "TF12.h" export * } -module "TF1Convolution.h" { header "TF1Convolution.h" export * } -module "TF1Editor.h" { header "TF1Editor.h" export * } -module "TF1NormSum.h" { header "TF1NormSum.h" export * } -module "TF2.h" { header "TF2.h" export * } -module "TF2GL.h" { header "TF2GL.h" export * } -module "TF3.h" { header "TF3.h" export * } -module "TFFTComplex.h" { header "TFFTComplex.h" export * } -module "TFFTComplexReal.h" { header "TFFTComplexReal.h" export * } -module "TFFTReal.h" { header "TFFTReal.h" export * } -module "TFFTRealComplex.h" { header "TFFTRealComplex.h" export * } -module "TFPBlock.h" { header "TFPBlock.h" export * } -module "TFTP.h" { header "TFTP.h" export * } -module "TFastCgi.h" { header "TFastCgi.h" export * } -module "TFeldmanCousins.h" { header "TFeldmanCousins.h" export * } -module "TFile.h" { header "TFile.h" export * } -module "TFileCacheRead.h" { header "TFileCacheRead.h" export * } -module "TFileCacheWrite.h" { header "TFileCacheWrite.h" export * } -module "TFileCollection.h" { header "TFileCollection.h" export * } -module "TFileDrawMap.h" { header "TFileDrawMap.h" export * } -module "TFileInfo.h" { header "TFileInfo.h" export * } -module "TFileIter.h" { header "TFileIter.h" export * } -module "TFileMergeInfo.h" { header "TFileMergeInfo.h" export * } -module "TFileMerger.h" { header "TFileMerger.h" export * } -module "TFilePrefetch.h" { header "TFilePrefetch.h" export * } -module "TFileSet.h" { header "TFileSet.h" export * } -module "TFileStager.h" { header "TFileStager.h" export * } -module "TFitEditor.h" { header "TFitEditor.h" export * } -module "TFitParametersDialog.h" { header "TFitParametersDialog.h" export * } -module "TFitResult.h" { header "TFitResult.h" export * } -module "TFitResultPtr.h" { header "TFitResultPtr.h" export * } -module "TFitter.h" { header "TFitter.h" export * } -module "TFoam.h" { header "TFoam.h" export * } -module "TFoamCell.h" { header "TFoamCell.h" export * } -module "TFoamIntegrand.h" { header "TFoamIntegrand.h" export * } -module "TFoamMaxwt.h" { header "TFoamMaxwt.h" export * } -module "TFoamSampler.h" { header "TFoamSampler.h" export * } -module "TFoamVect.h" { header "TFoamVect.h" export * } -module "TFolder.h" { header "TFolder.h" export * } -module "TFormLeafInfo.h" { header "TFormLeafInfo.h" export * } -module "TFormLeafInfoReference.h" { header "TFormLeafInfoReference.h" export * } -module "TFormula.h" { header "TFormula.h" export * } -module "TFractionFitter.h" { header "TFractionFitter.h" export * } -module "TFrame.h" { header "TFrame.h" export * } -module "TFrameEditor.h" { header "TFrameEditor.h" export * } -module "TFree.h" { header "TFree.h" export * } -module "TFriendElement.h" { header "TFriendElement.h" export * } -module "TFriendProxy.h" { header "TFriendProxy.h" export * } -module "TFriendProxyDescriptor.h" { header "TFriendProxyDescriptor.h" export * } -module "TFumili.h" { header "TFumili.h" export * } -module "TFumiliMinimizer.h" { header "TFumiliMinimizer.h" export * } -module "TFunction.h" { header "TFunction.h" export * } -module "TFunctionParametersDialog.h" { header "TFunctionParametersDialog.h" export * } -module "TFunctionTemplate.h" { header "TFunctionTemplate.h" export * } -module "TG3DLine.h" { header "TG3DLine.h" export * } -module "TGApplication.h" { header "TGApplication.h" export * } -module "TGButton.h" { header "TGButton.h" export * } -module "TGButtonGroup.h" { header "TGButtonGroup.h" export * } -module "TGCanvas.h" { header "TGCanvas.h" export * } -module "TGClient.h" { header "TGClient.h" export * } -module "TGCocoa.h" { header "TGCocoa.h" export * } -module "TGColorDialog.h" { header "TGColorDialog.h" export * } -module "TGColorSelect.h" { header "TGColorSelect.h" export * } -module "TGComboBox.h" { header "TGComboBox.h" export * } -module "TGCommandPlugin.h" { header "TGCommandPlugin.h" export * } -module "TGDMLParse.h" { header "TGDMLParse.h" export * } -module "TGDMLWrite.h" { header "TGDMLWrite.h" export * } -module "TGDNDManager.h" { header "TGDNDManager.h" export * } -module "TGDimension.h" { header "TGDimension.h" export * } -module "TGDockableFrame.h" { header "TGDockableFrame.h" export * } -module "TGDoubleSlider.h" { header "TGDoubleSlider.h" export * } -module "TGEventHandler.h" { header "TGEventHandler.h" export * } -module "TGFSComboBox.h" { header "TGFSComboBox.h" export * } -module "TGFSContainer.h" { header "TGFSContainer.h" export * } -module "TGFileBrowser.h" { header "TGFileBrowser.h" export * } -module "TGFileDialog.h" { header "TGFileDialog.h" export * } -module "TGFont.h" { header "TGFont.h" export * } -module "TGFontDialog.h" { header "TGFontDialog.h" export * } -module "TGFrame.h" { header "TGFrame.h" export * } -module "TGGC.h" { header "TGGC.h" export * } -module "TGHtml.h" { header "TGHtml.h" export * } -module "TGHtmlBrowser.h" { header "TGHtmlBrowser.h" export * } -module "TGHtmlTokens.h" { header "TGHtmlTokens.h" export * } -module "TGHtmlUri.h" { header "TGHtmlUri.h" export * } -module "TGIcon.h" { header "TGIcon.h" export * } -module "TGIdleHandler.h" { header "TGIdleHandler.h" export * } -module "TGImageMap.h" { header "TGImageMap.h" export * } -module "TGInputDialog.h" { header "TGInputDialog.h" export * } -module "TGL5D.h" { header "TGL5D.h" export * } -module "TGL5DDataSetEditor.h" { header "TGL5DDataSetEditor.h" export * } -module "TGL5DPainter.h" { header "TGL5DPainter.h" export * } -module "TGLAdapter.h" { header "TGLAdapter.h" export * } -module "TGLAnnotation.h" { header "TGLAnnotation.h" export * } -module "TGLAutoRotator.h" { header "TGLAutoRotator.h" export * } -module "TGLAxis.h" { header "TGLAxis.h" export * } -module "TGLAxisPainter.h" { header "TGLAxisPainter.h" export * } -module "TGLBoundingBox.h" { header "TGLBoundingBox.h" export * } -module "TGLBoxPainter.h" { header "TGLBoxPainter.h" export * } -module "TGLCamera.h" { header "TGLCamera.h" export * } -module "TGLCameraGuide.h" { header "TGLCameraGuide.h" export * } -module "TGLCameraOverlay.h" { header "TGLCameraOverlay.h" export * } -module "TGLClip.h" { header "TGLClip.h" export * } -module "TGLClipSetEditor.h" { header "TGLClipSetEditor.h" export * } -module "TGLContext.h" { header "TGLContext.h" export * } -module "TGLCylinder.h" { header "TGLCylinder.h" export * } -module "TGLEmbeddedViewer.h" { header "TGLEmbeddedViewer.h" export * } -module "TGLEventHandler.h" { header "TGLEventHandler.h" export * } -module "TGLFBO.h" { header "TGLFBO.h" export * } -module "TGLFaceSet.h" { header "TGLFaceSet.h" export * } -module "TGLFontManager.h" { header "TGLFontManager.h" export * } -module "TGLFormat.h" { header "TGLFormat.h" export * } -module "TGLH2PolyPainter.h" { header "TGLH2PolyPainter.h" export * } -module "TGLHistPainter.h" { header "TGLHistPainter.h" export * } -module "TGLIncludes.h" { header "TGLIncludes.h" export * } -module "TGLIsoMesh.h" { header "TGLIsoMesh.h" export * } -module "TGLLegoPainter.h" { header "TGLLegoPainter.h" export * } -module "TGLLightSet.h" { header "TGLLightSet.h" export * } -module "TGLLightSetEditor.h" { header "TGLLightSetEditor.h" export * } -module "TGLLockable.h" { header "TGLLockable.h" export * } -module "TGLLogicalShape.h" { header "TGLLogicalShape.h" export * } -module "TGLManip.h" { header "TGLManip.h" export * } -module "TGLManipSet.h" { header "TGLManipSet.h" export * } -module "TGLMarchingCubes.h" { header "TGLMarchingCubes.h" export * } -module "TGLObject.h" { header "TGLObject.h" export * } -module "TGLOrthoCamera.h" { header "TGLOrthoCamera.h" export * } -module "TGLOutput.h" { header "TGLOutput.h" export * } -module "TGLOverlay.h" { header "TGLOverlay.h" export * } -module "TGLOverlayButton.h" { header "TGLOverlayButton.h" export * } -module "TGLPShapeObj.h" { header "TGLPShapeObj.h" export * } -module "TGLPShapeObjEditor.h" { header "TGLPShapeObjEditor.h" export * } -module "TGLPShapeRef.h" { header "TGLPShapeRef.h" export * } -module "TGLPadPainter.h" { header "TGLPadPainter.h" export * } -module "TGLPadUtils.h" { header "TGLPadUtils.h" export * } -module "TGLParametric.h" { header "TGLParametric.h" export * } -module "TGLParametricEquationGL.h" { header "TGLParametricEquationGL.h" export * } -module "TGLPerspectiveCamera.h" { header "TGLPerspectiveCamera.h" export * } -module "TGLPhysicalShape.h" { header "TGLPhysicalShape.h" export * } -module "TGLPlot3D.h" { header "TGLPlot3D.h" export * } -module "TGLPlotBox.h" { header "TGLPlotBox.h" export * } -module "TGLPlotCamera.h" { header "TGLPlotCamera.h" export * } -module "TGLPlotPainter.h" { header "TGLPlotPainter.h" export * } -module "TGLPolyLine.h" { header "TGLPolyLine.h" export * } -module "TGLPolyMarker.h" { header "TGLPolyMarker.h" export * } -module "TGLQuadric.h" { header "TGLQuadric.h" export * } -module "TGLRnrCtx.h" { header "TGLRnrCtx.h" export * } -module "TGLRotateManip.h" { header "TGLRotateManip.h" export * } -module "TGLSAFrame.h" { header "TGLSAFrame.h" export * } -module "TGLSAViewer.h" { header "TGLSAViewer.h" export * } -module "TGLScaleManip.h" { header "TGLScaleManip.h" export * } -module "TGLScene.h" { header "TGLScene.h" export * } -module "TGLSceneBase.h" { header "TGLSceneBase.h" export * } -module "TGLSceneInfo.h" { header "TGLSceneInfo.h" export * } -module "TGLScenePad.h" { header "TGLScenePad.h" export * } -module "TGLSelectBuffer.h" { header "TGLSelectBuffer.h" export * } -module "TGLSelectRecord.h" { header "TGLSelectRecord.h" export * } -module "TGLSphere.h" { header "TGLSphere.h" export * } -module "TGLStopwatch.h" { header "TGLStopwatch.h" export * } -module "TGLSurfacePainter.h" { header "TGLSurfacePainter.h" export * } -module "TGLTF3Painter.h" { header "TGLTF3Painter.h" export * } -module "TGLTH3Composition.h" { header "TGLTH3Composition.h" export * } -module "TGLText.h" { header "TGLText.h" export * } -module "TGLTransManip.h" { header "TGLTransManip.h" export * } -module "TGLUtil.h" { header "TGLUtil.h" export * } -module "TGLViewer.h" { header "TGLViewer.h" export * } -module "TGLViewerBase.h" { header "TGLViewerBase.h" export * } -module "TGLViewerEditor.h" { header "TGLViewerEditor.h" export * } -module "TGLVoxelPainter.h" { header "TGLVoxelPainter.h" export * } -module "TGLWSIncludes.h" { header "TGLWSIncludes.h" export * } -module "TGLWidget.h" { header "TGLWidget.h" export * } -module "TGLabel.h" { header "TGLabel.h" export * } -module "TGLayout.h" { header "TGLayout.h" export * } -module "TGListBox.h" { header "TGListBox.h" export * } -module "TGListTree.h" { header "TGListTree.h" export * } -module "TGListView.h" { header "TGListView.h" export * } -module "TGMdi.h" { header "TGMdi.h" export * } -module "TGMdiDecorFrame.h" { header "TGMdiDecorFrame.h" export * } -module "TGMdiFrame.h" { header "TGMdiFrame.h" export * } -module "TGMdiMainFrame.h" { header "TGMdiMainFrame.h" export * } -module "TGMdiMenu.h" { header "TGMdiMenu.h" export * } -module "TGMenu.h" { header "TGMenu.h" export * } -module "TGMimeTypes.h" { header "TGMimeTypes.h" export * } -module "TGMsgBox.h" { header "TGMsgBox.h" export * } -module "TGNumberEntry.h" { header "TGNumberEntry.h" export * } -module "TGOSXGL.h" { header "TGOSXGL.h" export * } -module "TGObject.h" { header "TGObject.h" export * } -module "TGPack.h" { header "TGPack.h" export * } -module "TGPasswdDialog.h" { header "TGPasswdDialog.h" export * } -module "TGPicture.h" { header "TGPicture.h" export * } -module "TGProgressBar.h" { header "TGProgressBar.h" export * } -module "TGQuartz.h" { header "TGQuartz.h" export * } -module "TGRedirectOutputGuard.h" { header "TGRedirectOutputGuard.h" export * } -module "TGResourcePool.h" { header "TGResourcePool.h" export * } -module "TGScrollBar.h" { header "TGScrollBar.h" export * } -module "TGShapedFrame.h" { header "TGShapedFrame.h" export * } -module "TGShutter.h" { header "TGShutter.h" export * } -module "TGSimpleTable.h" { header "TGSimpleTable.h" export * } -module "TGSimpleTableInterface.h" { header "TGSimpleTableInterface.h" export * } -module "TGSlider.h" { header "TGSlider.h" export * } -module "TGSpeedo.h" { header "TGSpeedo.h" export * } -module "TGSplitFrame.h" { header "TGSplitFrame.h" export * } -module "TGSplitter.h" { header "TGSplitter.h" export * } -module "TGStatusBar.h" { header "TGStatusBar.h" export * } -module "TGString.h" { header "TGString.h" export * } -module "TGTRA.h" { header "TGTRA.h" export * } -module "TGTab.h" { header "TGTab.h" export * } -module "TGTable.h" { header "TGTable.h" export * } -module "TGTableCell.h" { header "TGTableCell.h" export * } -module "TGTableContainer.h" { header "TGTableContainer.h" export * } -module "TGTableHeader.h" { header "TGTableHeader.h" export * } -module "TGTableLayout.h" { header "TGTableLayout.h" export * } -module "TGText.h" { header "TGText.h" export * } -module "TGTextBuffer.h" { header "TGTextBuffer.h" export * } -module "TGTextEdit.h" { header "TGTextEdit.h" export * } -module "TGTextEditDialogs.h" { header "TGTextEditDialogs.h" export * } -module "TGTextEditor.h" { header "TGTextEditor.h" export * } -module "TGTextEntry.h" { header "TGTextEntry.h" export * } -module "TGTextView.h" { header "TGTextView.h" export * } -module "TGTextViewStream.h" { header "TGTextViewStream.h" export * } -module "TGToolBar.h" { header "TGToolBar.h" export * } -module "TGToolTip.h" { header "TGToolTip.h" export * } -module "TGTreeTable.h" { header "TGTreeTable.h" export * } -module "TGTripleSlider.h" { header "TGTripleSlider.h" export * } -module "TGView.h" { header "TGView.h" export * } -module "TGWidget.h" { header "TGWidget.h" export * } -module "TGWindow.h" { header "TGWindow.h" export * } -module "TGXYLayout.h" { header "TGXYLayout.h" export * } -module "TGaxis.h" { header "TGaxis.h" export * } -module "TGedEditor.h" { header "TGedEditor.h" export * } -module "TGedFrame.h" { header "TGedFrame.h" export * } -module "TGedMarkerSelect.h" { header "TGedMarkerSelect.h" export * } -module "TGedPatternSelect.h" { header "TGedPatternSelect.h" export * } -module "TGenCollectionProxy.h" { header "TGenCollectionProxy.h" export * } -module "TGenCollectionStreamer.h" { header "TGenCollectionStreamer.h" export * } -module "TGenPhaseSpace.h" { header "TGenPhaseSpace.h" export * } -module "TGenerator.h" { header "TGenerator.h" export * } -//module "TGenericClassInfo.h" { header "TGenericClassInfo.h" export * } -- see Rtypes.h -module "TGenericTable.h" { header "TGenericTable.h" export * } -module "TGeoArb8.h" { header "TGeoArb8.h" export * } -module "TGeoAtt.h" { header "TGeoAtt.h" export * } -module "TGeoBBox.h" { header "TGeoBBox.h" export * } -module "TGeoBBoxEditor.h" { header "TGeoBBoxEditor.h" export * } -module "TGeoBoolNode.h" { header "TGeoBoolNode.h" export * } -module "TGeoBranchArray.h" { header "TGeoBranchArray.h" export * } -module "TGeoBuilder.h" { header "TGeoBuilder.h" export * } -module "TGeoCache.h" { header "TGeoCache.h" export * } -module "TGeoChecker.h" { header "TGeoChecker.h" export * } -module "TGeoCompositeShape.h" { header "TGeoCompositeShape.h" export * } -module "TGeoCone.h" { header "TGeoCone.h" export * } -module "TGeoConeEditor.h" { header "TGeoConeEditor.h" export * } -module "TGeoElement.h" { header "TGeoElement.h" export * } -module "TGeoEltu.h" { header "TGeoEltu.h" export * } -module "TGeoEltuEditor.h" { header "TGeoEltuEditor.h" export * } -module "TGeoExtension.h" { header "TGeoExtension.h" export * } -module "TGeoGedFrame.h" { header "TGeoGedFrame.h" export * } -module "TGeoGlobalMagField.h" { header "TGeoGlobalMagField.h" export * } -module "TGeoHalfSpace.h" { header "TGeoHalfSpace.h" export * } -module "TGeoHelix.h" { header "TGeoHelix.h" export * } -module "TGeoHype.h" { header "TGeoHype.h" export * } -module "TGeoHypeEditor.h" { header "TGeoHypeEditor.h" export * } -module "TGeoMCGeometry.h" { header "TGeoMCGeometry.h" export * } -module "TGeoManager.h" { header "TGeoManager.h" export * } -module "TGeoManagerEditor.h" { header "TGeoManagerEditor.h" export * } -module "TGeoMaterial.h" { header "TGeoMaterial.h" export * } -module "TGeoMaterialEditor.h" { header "TGeoMaterialEditor.h" export * } -module "TGeoMatrix.h" { header "TGeoMatrix.h" export * } -module "TGeoMatrixEditor.h" { header "TGeoMatrixEditor.h" export * } -module "TGeoMedium.h" { header "TGeoMedium.h" export * } -module "TGeoMediumEditor.h" { header "TGeoMediumEditor.h" export * } -module "TGeoNavigator.h" { header "TGeoNavigator.h" export * } -module "TGeoNode.h" { header "TGeoNode.h" export * } -module "TGeoNodeEditor.h" { header "TGeoNodeEditor.h" export * } -module "TGeoOverlap.h" { header "TGeoOverlap.h" export * } -module "TGeoPainter.h" { header "TGeoPainter.h" export * } -module "TGeoPara.h" { header "TGeoPara.h" export * } -module "TGeoParaEditor.h" { header "TGeoParaEditor.h" export * } -module "TGeoParaboloid.h" { header "TGeoParaboloid.h" export * } -module "TGeoParallelWorld.h" { header "TGeoParallelWorld.h" export * } -module "TGeoPatternFinder.h" { header "TGeoPatternFinder.h" export * } -module "TGeoPcon.h" { header "TGeoPcon.h" export * } -module "TGeoPconEditor.h" { header "TGeoPconEditor.h" export * } -module "TGeoPgon.h" { header "TGeoPgon.h" export * } -module "TGeoPgonEditor.h" { header "TGeoPgonEditor.h" export * } -module "TGeoPhysicalNode.h" { header "TGeoPhysicalNode.h" export * } -module "TGeoPolygon.h" { header "TGeoPolygon.h" export * } -module "TGeoRCPtr.h" { header "TGeoRCPtr.h" export * } -module "TGeoScaledShape.h" { header "TGeoScaledShape.h" export * } -module "TGeoShape.h" { header "TGeoShape.h" export * } -module "TGeoShapeAssembly.h" { header "TGeoShapeAssembly.h" export * } -module "TGeoSphere.h" { header "TGeoSphere.h" export * } -module "TGeoSphereEditor.h" { header "TGeoSphereEditor.h" export * } -module "TGeoStateInfo.h" { header "TGeoStateInfo.h" export * } -module "TGeoTabManager.h" { header "TGeoTabManager.h" export * } -module "TGeoTorus.h" { header "TGeoTorus.h" export * } -module "TGeoTorusEditor.h" { header "TGeoTorusEditor.h" export * } -module "TGeoTrack.h" { header "TGeoTrack.h" export * } -module "TGeoTrapEditor.h" { header "TGeoTrapEditor.h" export * } -module "TGeoTrd1.h" { header "TGeoTrd1.h" export * } -module "TGeoTrd1Editor.h" { header "TGeoTrd1Editor.h" export * } -module "TGeoTrd2.h" { header "TGeoTrd2.h" export * } -module "TGeoTrd2Editor.h" { header "TGeoTrd2Editor.h" export * } -module "TGeoTube.h" { header "TGeoTube.h" export * } -module "TGeoTubeEditor.h" { header "TGeoTubeEditor.h" export * } -module "TGeoUniformMagField.h" { header "TGeoUniformMagField.h" export * } -module "TGeoVolume.h" { header "TGeoVolume.h" export * } -module "TGeoVolumeEditor.h" { header "TGeoVolumeEditor.h" export * } -module "TGeoVoxelFinder.h" { header "TGeoVoxelFinder.h" export * } -module "TGeoXtru.h" { header "TGeoXtru.h" export * } -module "TGeometry.h" { header "TGeometry.h" export * } -module "TGlobal.h" { header "TGlobal.h" export * } -module "TGondzioSolver.h" { header "TGondzioSolver.h" export * } -module "TGraph.h" { header "TGraph.h" export * } -module "TGraph2D.h" { header "TGraph2D.h" export * } -module "TGraph2DErrors.h" { header "TGraph2DErrors.h" export * } -module "TGraph2DPainter.h" { header "TGraph2DPainter.h" export * } -module "TGraphAsymmErrors.h" { header "TGraphAsymmErrors.h" export * } -module "TGraphBentErrors.h" { header "TGraphBentErrors.h" export * } -module "TGraphDelaunay.h" { header "TGraphDelaunay.h" export * } -module "TGraphDelaunay2D.h" { header "TGraphDelaunay2D.h" export * } -module "TGraphEdge.h" { header "TGraphEdge.h" export * } -module "TGraphEditor.h" { header "TGraphEditor.h" export * } -module "TGraphErrors.h" { header "TGraphErrors.h" export * } -module "TGraphNode.h" { header "TGraphNode.h" export * } -module "TGraphPainter.h" { header "TGraphPainter.h" export * } -module "TGraphPolar.h" { header "TGraphPolar.h" export * } -module "TGraphPolargram.h" { header "TGraphPolargram.h" export * } -module "TGraphQQ.h" { header "TGraphQQ.h" export * } -module "TGraphSmooth.h" { header "TGraphSmooth.h" export * } -module "TGraphStruct.h" { header "TGraphStruct.h" export * } -module "TGraphTime.h" { header "TGraphTime.h" export * } -module "TGrid.h" { header "TGrid.h" export * } -module "TGridCollection.h" { header "TGridCollection.h" export * } -module "TGridJDL.h" { header "TGridJDL.h" export * } -module "TGridJob.h" { header "TGridJob.h" export * } -module "TGridJobStatus.h" { header "TGridJobStatus.h" export * } -module "TGridJobStatusList.h" { header "TGridJobStatusList.h" export * } -module "TGridResult.h" { header "TGridResult.h" export * } -module "TGroupButton.h" { header "TGroupButton.h" export * } -module "TGuiBldDragManager.h" { header "TGuiBldDragManager.h" export * } -module "TGuiBldEditor.h" { header "TGuiBldEditor.h" export * } -module "TGuiBldGeometryFrame.h" { header "TGuiBldGeometryFrame.h" export * } -module "TGuiBldHintsButton.h" { header "TGuiBldHintsButton.h" export * } -module "TGuiBldHintsEditor.h" { header "TGuiBldHintsEditor.h" export * } -module "TGuiBldNameFrame.h" { header "TGuiBldNameFrame.h" export * } -module "TGuiBuilder.h" { header "TGuiBuilder.h" export * } -module "TGuiFactory.h" { header "TGuiFactory.h" export * } -module "TH1.h" { header "TH1.h" export * } -module "TH1C.h" { header "TH1C.h" export * } -module "TH1D.h" { header "TH1D.h" export * } -module "TH1Editor.h" { header "TH1Editor.h" export * } -module "TH1F.h" { header "TH1F.h" export * } -module "TH1I.h" { header "TH1I.h" export * } -module "TH1K.h" { header "TH1K.h" export * } -module "TH1S.h" { header "TH1S.h" export * } -module "TH2.h" { header "TH2.h" export * } -module "TH2C.h" { header "TH2C.h" export * } -module "TH2D.h" { header "TH2D.h" export * } -module "TH2Editor.h" { header "TH2Editor.h" export * } -module "TH2F.h" { header "TH2F.h" export * } -module "TH2GL.h" { header "TH2GL.h" export * } -module "TH2I.h" { header "TH2I.h" export * } -module "TH2Poly.h" { header "TH2Poly.h" export * } -module "TH2S.h" { header "TH2S.h" export * } -module "TH3.h" { header "TH3.h" export * } -module "TH3C.h" { header "TH3C.h" export * } -module "TH3D.h" { header "TH3D.h" export * } -module "TH3F.h" { header "TH3F.h" export * } -module "TH3GL.h" { header "TH3GL.h" export * } -module "TH3I.h" { header "TH3I.h" export * } -module "TH3S.h" { header "TH3S.h" export * } -module "THLimitsFinder.h" { header "THLimitsFinder.h" export * } -module "THStack.h" { header "THStack.h" export * } -module "THYPE.h" { header "THYPE.h" export * } -module "THashList.h" { header "THashList.h" export * } -module "THashTable.h" { header "THashTable.h" export * } -module "THelix.h" { header "THelix.h" export * } -module "THistPainter.h" { header "THistPainter.h" export * } -module "THn.h" { header "THn.h" export * } -module "THnBase.h" { header "THnBase.h" export * } -module "THnSparse.h" { header "THnSparse.h" export * } -module "THnSparse_Internal.h" { header "THnSparse_Internal.h" export * } -module "THostAuth.h" { header "THostAuth.h" export * } -module "THtml.h" { header "THtml.h" export * } -module "THttpCallArg.h" { header "THttpCallArg.h" export * } -module "THttpEngine.h" { header "THttpEngine.h" export * } -module "THttpServer.h" { header "THttpServer.h" export * } -module "TImage.h" { header "TImage.h" export * } -module "TImageDump.h" { header "TImageDump.h" export * } -module "TImagePlugin.h" { header "TImagePlugin.h" export * } -module "TIndArray.h" { header "TIndArray.h" export * } -module "TIndexTable.h" { header "TIndexTable.h" export * } -module "TInetAddress.h" { header "TInetAddress.h" export * } -module "TInspectCanvas.h" { header "TInspectCanvas.h" export * } -module "TInspectorImp.h" { header "TInspectorImp.h" export * } -module "TInterpreter.h" { header "TInterpreter.h" export * } -module "TInterpreterValue.h" { header "TInterpreterValue.h" export * } -module "TIsAProxy.h" { header "TIsAProxy.h" export * } -module "TIterator.h" { header "TIterator.h" export * } -module "TKDE.h" { header "TKDE.h" export * } -module "TKDEAdapter.h" { header "TKDEAdapter.h" export * } -module "TKDEFGT.h" { header "TKDEFGT.h" export * } -module "TKDTree.h" { header "TKDTree.h" export * } -module "TKDTreeBinning.h" { header "TKDTreeBinning.h" export * } -module "TKSocket.h" { header "TKSocket.h" export * } -module "TKey.h" { header "TKey.h" export * } -module "TKeyMapFile.h" { header "TKeyMapFile.h" export * } -module "TKeySQL.h" { header "TKeySQL.h" export * } -module "TKeyXML.h" { header "TKeyXML.h" export * } -module "TLDAPAttribute.h" { header "TLDAPAttribute.h" export * } -module "TLDAPEntry.h" { header "TLDAPEntry.h" export * } -module "TLDAPResult.h" { header "TLDAPResult.h" export * } -module "TLDAPServer.h" { header "TLDAPServer.h" export * } -module "TLatex.h" { header "TLatex.h" export * } -module "TLeaf.h" { header "TLeaf.h" export * } -module "TLeafB.h" { header "TLeafB.h" export * } -module "TLeafC.h" { header "TLeafC.h" export * } -module "TLeafD.h" { header "TLeafD.h" export * } -module "TLeafElement.h" { header "TLeafElement.h" export * } -module "TLeafF.h" { header "TLeafF.h" export * } -module "TLeafI.h" { header "TLeafI.h" export * } -module "TLeafL.h" { header "TLeafL.h" export * } -module "TLeafO.h" { header "TLeafO.h" export * } -module "TLeafObject.h" { header "TLeafObject.h" export * } -module "TLeafS.h" { header "TLeafS.h" export * } -module "TLegend.h" { header "TLegend.h" export * } -module "TLegendEntry.h" { header "TLegendEntry.h" export * } -module "TLego.h" { header "TLego.h" export * } -module "TLimit.h" { header "TLimit.h" export * } -module "TLimitDataSource.h" { header "TLimitDataSource.h" export * } -module "TLine.h" { header "TLine.h" export * } -module "TLineEditor.h" { header "TLineEditor.h" export * } -module "TLinearFitter.h" { header "TLinearFitter.h" export * } -module "TLinearMinimizer.h" { header "TLinearMinimizer.h" export * } -module "TLink.h" { header "TLink.h" export * } -module "TList.h" { header "TList.h" export * } -module "TListOfDataMembers.h" { header "TListOfDataMembers.h" export * } -module "TListOfEnums.h" { header "TListOfEnums.h" export * } -module "TListOfEnumsWithLock.h" { header "TListOfEnumsWithLock.h" export * } -module "TListOfFunctionTemplates.h" { header "TListOfFunctionTemplates.h" export * } -module "TListOfFunctions.h" { header "TListOfFunctions.h" export * } -module "TLockFile.h" { header "TLockFile.h" export * } -module "TLorentzRotation.h" { header "TLorentzRotation.h" export * } -module "TLorentzVector.h" { header "TLorentzVector.h" export * } -module "TMCOptical.h" { header "TMCOptical.h" export * } -module "TMCParticleType.h" { header "TMCParticleType.h" export * } -module "TMCProcess.h" { header "TMCProcess.h" export * } -module "TMCVerbose.h" { header "TMCVerbose.h" export * } -module "TMCtls.h" { header "TMCtls.h" export * } -module "TMD5.h" { header "TMD5.h" export * } -module "TMLPAnalyzer.h" { header "TMLPAnalyzer.h" export * } -module "TMPClient.h" { header "TMPClient.h" export * } -module "TMPWorker.h" { header "TMPWorker.h" export * } -/*module "TMVA" { - requires cplusplus - umbrella "TMVA" - module * { export * } - - // FIXME: Remove headers which depend on cuda or tbb since they are not well - // protected in the cases where tbb or cuda are not present on the system. - exclude header "TMVA/DNN/Architectures/Cuda.h" - exclude header "TMVA/DNN/Architectures/Cuda/CudaBuffers.h" - exclude header "TMVA/DNN/Architectures/Cuda/CudaMatrix.h" - exclude header "TMVA/DNN/Architectures/Cuda/Device.h" - exclude header "TMVA/DNN/Architectures/Cpu.h" - exclude header "TMVA/DNN/Architectures/Cpu/CpuMatrix.h" - // FIXME: Optional PyMVA gets installed in $ROOTSYS/TMVA. PyMVA* depend on - // numpy, whose -I path gets passed only when building the related to PyMVA - // sources. I.e. we cannot generate this module implicitly if it included - // PyMVA, because we don't have always the relevant -I passed to the compiler. - exclude header "TMVA/PyMethodBase.h" - exclude header "TMVA/MethodPyAdaBoost.h" - exclude header "TMVA/MethodPyGTB.h" - exclude header "TMVA/MethodPyRandomForest.h" -}*/ -module "TMacOSXSystem.h" { header "TMacOSXSystem.h" export * } -module "TMacro.h" { header "TMacro.h" export * } -module "TMakeProject.h" { header "TMakeProject.h" export * } -module "TMap.h" { header "TMap.h" export * } -module "TMapFile.h" { header "TMapFile.h" export * } -module "TMarker.h" { header "TMarker.h" export * } -module "TMarker3DBox.h" { header "TMarker3DBox.h" export * } -module "TMaterial.h" { header "TMaterial.h" export * } -module "TMath.h" { header "TMath.h" export * } -module "TMathBase.h" { header "TMathBase.h" export * } -module "TMathText.h" { header "TMathText.h" export * } -module "TMatrix.h" { header "TMatrix.h" export * } -module "TMatrixD.h" { header "TMatrixD.h" export * } -module "TMatrixDBase.h" { header "TMatrixDBase.h" export * } -module "TMatrixDBasefwd.h" { header "TMatrixDBasefwd.h" export * } -module "TMatrixDEigen.h" { header "TMatrixDEigen.h" export * } -module "TMatrixDLazy.h" { header "TMatrixDLazy.h" export * } -module "TMatrixDSparse.h" { header "TMatrixDSparse.h" export * } -module "TMatrixDSparsefwd.h" { header "TMatrixDSparsefwd.h" export * } -module "TMatrixDSym.h" { header "TMatrixDSym.h" export * } -module "TMatrixDSymEigen.h" { header "TMatrixDSymEigen.h" export * } -module "TMatrixDSymfwd.h" { header "TMatrixDSymfwd.h" export * } -module "TMatrixDUtils.h" { header "TMatrixDUtils.h" export * } -module "TMatrixDUtilsfwd.h" { header "TMatrixDUtilsfwd.h" export * } -module "TMatrixDfwd.h" { header "TMatrixDfwd.h" export * } -module "TMatrixF.h" { header "TMatrixF.h" export * } -module "TMatrixFBase.h" { header "TMatrixFBase.h" export * } -module "TMatrixFBasefwd.h" { header "TMatrixFBasefwd.h" export * } -module "TMatrixFLazy.h" { header "TMatrixFLazy.h" export * } -module "TMatrixFSparse.h" { header "TMatrixFSparse.h" export * } -module "TMatrixFSparsefwd.h" { header "TMatrixFSparsefwd.h" export * } -module "TMatrixFSym.h" { header "TMatrixFSym.h" export * } -module "TMatrixFSymfwd.h" { header "TMatrixFSymfwd.h" export * } -module "TMatrixFUtils.h" { header "TMatrixFUtils.h" export * } -module "TMatrixFUtilsfwd.h" { header "TMatrixFUtilsfwd.h" export * } -module "TMatrixFfwd.h" { header "TMatrixFfwd.h" export * } -module "TMatrixT.h" { header "TMatrixT.h" export * } -module "TMatrixTBase.h" { header "TMatrixTBase.h" export * } -module "TMatrixTCramerInv.h" { header "TMatrixTCramerInv.h" export * } -module "TMatrixTLazy.h" { header "TMatrixTLazy.h" export * } -module "TMatrixTSparse.h" { header "TMatrixTSparse.h" export * } -module "TMatrixTSym.h" { header "TMatrixTSym.h" export * } -module "TMatrixTSymCramerInv.h" { header "TMatrixTSymCramerInv.h" export * } -module "TMatrixTUtils.h" { header "TMatrixTUtils.h" export * } -module "TMehrotraSolver.h" { header "TMehrotraSolver.h" export * } -module "TMemFile.h" { header "TMemFile.h" export * } -module "TMemStat.h" { header "TMemStat.h" export * } -module "TMemStatBacktrace.h" { header "TMemStatBacktrace.h" export * } -module "TMemStatDef.h" { header "TMemStatDef.h" export * } -module "TMemStatHelpers.h" { header "TMemStatHelpers.h" export * } -module "TMemStatHook.h" { header "TMemStatHook.h" export * } -module "TMemStatMng.h" { header "TMemStatMng.h" export * } -module "TMemStatShow.h" { header "TMemStatShow.h" export * } -module "TMemberInspector.h" { header "TMemberInspector.h" export * } -module "TMemberStreamer.h" { header "TMemberStreamer.h" export * } -module "TMessage.h" { header "TMessage.h" export * } -module "TMessageHandler.h" { header "TMessageHandler.h" export * } -module "TMetaUtils.h" { header "TMetaUtils.h" export * } -module "TMethod.h" { header "TMethod.h" export * } -module "TMethodArg.h" { header "TMethodArg.h" export * } -module "TMethodCall.h" { header "TMethodCall.h" export * } -module "TMinuit.h" { header "TMinuit.h" export * } -module "TMinuit2TraceObject.h" { header "TMinuit2TraceObject.h" export * } -module "TMinuitMinimizer.h" { header "TMinuitMinimizer.h" export * } -module "TMixture.h" { header "TMixture.h" export * } -module "TMonitor.h" { header "TMonitor.h" export * } -module "TMultiDimFit.h" { header "TMultiDimFit.h" export * } -module "TMultiGraph.h" { header "TMultiGraph.h" export * } -module "TMultiLayerPerceptron.h" { header "TMultiLayerPerceptron.h" export * } -module "TMutex.h" { header "TMutex.h" export * } -module "TMutexImp.h" { header "TMutexImp.h" export * } -module "TNDArray.h" { header "TNDArray.h" export * } -module "TNamed.h" { header "TNamed.h" export * } -module "TNetFile.h" { header "TNetFile.h" export * } -module "TNetFileStager.h" { header "TNetFileStager.h" export * } -module "TNeuron.h" { header "TNeuron.h" export * } -module "TNode.h" { header "TNode.h" export * } -module "TNodeDiv.h" { header "TNodeDiv.h" export * } -module "TNtuple.h" { header "TNtuple.h" export * } -module "TNtupleD.h" { header "TNtupleD.h" export * } -module "TODBCResult.h" { header "TODBCResult.h" export * } -module "TODBCRow.h" { header "TODBCRow.h" export * } -module "TODBCServer.h" { header "TODBCServer.h" export * } -module "TODBCStatement.h" { header "TODBCStatement.h" export * } -module "TObjArray.h" { header "TObjArray.h" export * } -module "TObjString.h" { header "TObjString.h" export * } -module "TObject.h" { header "TObject.h" export * } -module "TObjectSet.h" { header "TObjectSet.h" export * } -module "TObjectSpy.h" { header "TObjectSpy.h" export * } -module "TObjectTable.h" { header "TObjectTable.h" export * } -module "TOrdCollection.h" { header "TOrdCollection.h" export * } -module "TOutputListSelectorDataMap.h" { header "TOutputListSelectorDataMap.h" export * } -module "TPARA.h" { header "TPARA.h" export * } -module "TPCON.h" { header "TPCON.h" export * } -module "TPDF.h" { header "TPDF.h" export * } -module "TPDGCode.h" { header "TPDGCode.h" export * } -module "TPGON.h" { header "TPGON.h" export * } -module "TPRegexp.h" { header "TPRegexp.h" export * } -module "TPServerSocket.h" { header "TPServerSocket.h" export * } -module "TPSocket.h" { header "TPSocket.h" export * } -module "TPacketizer.h" { header "TPacketizer.h" export * } -module "TPacketizerAdaptive.h" { header "TPacketizerAdaptive.h" export * } -module "TPacketizerFile.h" { header "TPacketizerFile.h" export * } -module "TPacketizerMulti.h" { header "TPacketizerMulti.h" export * } -module "TPacketizerUnit.h" { header "TPacketizerUnit.h" export * } -module "TPad.h" { header "TPad.h" export * } -module "TPadEditor.h" { header "TPadEditor.h" export * } -module "TPadPainter.h" { header "TPadPainter.h" export * } -module "TPainter3dAlgorithms.h" { header "TPainter3dAlgorithms.h" export * } -module "TPaletteAxis.h" { header "TPaletteAxis.h" export * } -module "TParallelCoord.h" { header "TParallelCoord.h" export * } -module "TParallelCoordEditor.h" { header "TParallelCoordEditor.h" export * } -module "TParallelCoordRange.h" { header "TParallelCoordRange.h" export * } -module "TParallelCoordVar.h" { header "TParallelCoordVar.h" export * } -module "TParallelMergingFile.h" { header "TParallelMergingFile.h" export * } -module "TParameter.h" { header "TParameter.h" export * } -module "TParticle.h" { header "TParticle.h" export * } -module "TParticleClassPDG.h" { header "TParticleClassPDG.h" export * } -module "TParticlePDG.h" { header "TParticlePDG.h" export * } -module "TPave.h" { header "TPave.h" export * } -module "TPaveClass.h" { header "TPaveClass.h" export * } -module "TPaveLabel.h" { header "TPaveLabel.h" export * } -module "TPaveStats.h" { header "TPaveStats.h" export * } -module "TPaveStatsEditor.h" { header "TPaveStatsEditor.h" export * } -module "TPaveText.h" { header "TPaveText.h" export * } -module "TPavesText.h" { header "TPavesText.h" export * } -module "TPerfStats.h" { header "TPerfStats.h" export * } -module "TPie.h" { header "TPie.h" export * } -module "TPieEditor.h" { header "TPieEditor.h" export * } -module "TPieSlice.h" { header "TPieSlice.h" export * } -module "TPieSliceEditor.h" { header "TPieSliceEditor.h" export * } -module "TPluginManager.h" { header "TPluginManager.h" export * } -module "TPoint.h" { header "TPoint.h" export * } -module "TPointSet3D.h" { header "TPointSet3D.h" export * } -module "TPointSet3DGL.h" { header "TPointSet3DGL.h" export * } -module "TPoints.h" { header "TPoints.h" export * } -module "TPoints3D.h" { header "TPoints3D.h" export * } -module "TPoints3DABC.h" { header "TPoints3DABC.h" export * } -module "TPointsArray3D.h" { header "TPointsArray3D.h" export * } -module "TPolyLine.h" { header "TPolyLine.h" export * } -module "TPolyLine3D.h" { header "TPolyLine3D.h" export * } -module "TPolyLineShape.h" { header "TPolyLineShape.h" export * } -module "TPolyMarker.h" { header "TPolyMarker.h" export * } -module "TPolyMarker3D.h" { header "TPolyMarker3D.h" export * } -module "TPoolProcessor.h" { header "TPoolProcessor.h" export * } -module "TPoolWorker.h" { header "TPoolWorker.h" export * } -module "TPosixCondition.h" { header "TPosixCondition.h" export * } -module "TPosixMutex.h" { header "TPosixMutex.h" export * } -module "TPosixThread.h" { header "TPosixThread.h" export * } -module "TPosixThreadFactory.h" { header "TPosixThreadFactory.h" export * } -module "TPostScript.h" { header "TPostScript.h" export * } -module "TPrimary.h" { header "TPrimary.h" export * } -module "TPrincipal.h" { header "TPrincipal.h" export * } -module "TProcPool.h" { header "TProcPool.h" export * } -module "TProcessID.h" { header "TProcessID.h" export * } -module "TProcessUUID.h" { header "TProcessUUID.h" export * } -module "TProfile.h" { header "TProfile.h" export * } -module "TProfile2D.h" { header "TProfile2D.h" export * } -module "TProfile3D.h" { header "TProfile3D.h" export * } -module "TProof.h" { header "TProof.h" export * } -module "TProofBench.h" { header "TProofBench.h" export * } -module "TProofBenchDataSet.h" { header "TProofBenchDataSet.h" export * } -module "TProofBenchRun.h" { header "TProofBenchRun.h" export * } -module "TProofBenchRunCPU.h" { header "TProofBenchRunCPU.h" export * } -module "TProofBenchRunDataRead.h" { header "TProofBenchRunDataRead.h" export * } -module "TProofBenchTypes.h" { header "TProofBenchTypes.h" export * } -module "TProofChain.h" { header "TProofChain.h" export * } -module "TProofCondor.h" { header "TProofCondor.h" export * } -module "TProofDebug.h" { header "TProofDebug.h" export * } -module "TProofDraw.h" { header "TProofDraw.h" export * } -module "TProofLimitsFinder.h" { header "TProofLimitsFinder.h" export * } -module "TProofLite.h" { header "TProofLite.h" export * } -module "TProofLog.h" { header "TProofLog.h" export * } -module "TProofMgr.h" { header "TProofMgr.h" export * } -module "TProofMgrLite.h" { header "TProofMgrLite.h" export * } -module "TProofMonSender.h" { header "TProofMonSender.h" export * } -module "TProofMonSenderML.h" { header "TProofMonSenderML.h" export * } -module "TProofMonSenderSQL.h" { header "TProofMonSenderSQL.h" export * } -module "TProofNodeInfo.h" { header "TProofNodeInfo.h" export * } -module "TProofNodes.h" { header "TProofNodes.h" export * } -module "TProofOutputFile.h" { header "TProofOutputFile.h" export * } -module "TProofOutputList.h" { header "TProofOutputList.h" export * } -module "TProofPerfAnalysis.h" { header "TProofPerfAnalysis.h" export * } -module "TProofPlayer.h" { header "TProofPlayer.h" export * } -module "TProofPlayerLite.h" { header "TProofPlayerLite.h" export * } -module "TProofProgressDialog.h" { header "TProofProgressDialog.h" export * } -module "TProofProgressLog.h" { header "TProofProgressLog.h" export * } -module "TProofProgressMemoryPlot.h" { header "TProofProgressMemoryPlot.h" export * } -module "TProofProgressStatus.h" { header "TProofProgressStatus.h" export * } -module "TProofQueryResult.h" { header "TProofQueryResult.h" export * } -module "TProofResources.h" { header "TProofResources.h" export * } -module "TProofResourcesStatic.h" { header "TProofResourcesStatic.h" export * } -module "TProofServ.h" { header "TProofServ.h" export * } -module "TProofServLite.h" { header "TProofServLite.h" export * } -module "TProofSuperMaster.h" { header "TProofSuperMaster.h" export * } -module "TProtoClass.h" { header "TProtoClass.h" export * } -module "TPyArg.h" { header "TPyArg.h" export * } -module "TPyDispatcher.h" { header "TPyDispatcher.h" export * } -module "TPyException.h" { header "TPyException.h" export * } -module "TPyFitFunction.h" { header "TPyFitFunction.h" export * } -module "TPyROOTApplication.h" { header "TPyROOTApplication.h" export * } -module "TPyReturn.h" { header "TPyReturn.h" export * } -module "TPySelector.h" { header "TPySelector.h" export * } -module "TPython.h" { header "TPython.h" export * } -module "TQClass.h" { header "TQClass.h" export * } -module "TQCommand.h" { header "TQCommand.h" export * } -//module "TQConnection.h" { header "TQConnection.h" export * } -- see TQObject +// This module is special, it contains headers which don't require rtti support +// to build (eg. don't use dynamic_cast or typeid). They are also needed when +// compiling rootcling with -fno-rtti. We have to keep them outside module ROOT +// to avoid -fno-rtti invocation to trigger building of entire module ROOT +// some of whose headers require -frtti. +module ROOT_Core_Config_C { + //requires cplusplus + + // needs C++ and in some cases we build with C (ZTrees.h, through ZDeflate.c) + textual header "RConversionRuleParser.h" + exclude header "RtypesImp.h" + header "Rtypes.h" + header "TClassEdit.h" + header "TMetaUtils.h" + header "TSchemaType.h" + header "DllImport.h" // Should merge in RConfig.h. + header "Rtypeinfo.h" // Old and useless, should delete. + header "TGenericClassInfo.h" + header "TSchemaHelper.h" + header "ESTLType.h" + header "RStringView.h" + header "Varargs.h" // Old should revisit, either drop or delete. + header "RootMetaSelection.h" + header "TString.h" + header "Riosfwd.h" + header "snprintf.h" // #included by Rtypes, could go away? + header "strlcpy.h" // #included by Rtypes, could go away? -module "TQObject.h" { - // There is a cross dependency between TQObject and TQConnection. - // FIXME: Why TQObject need to know anything about TQConnection... - header "TQConnection.h" - header "TQObject.h" - header "TQObjectEmitVA.h" - export * -} -//module "TQObjectEmitVA.h" { header "TQObjectEmitVA.h" export * } -- see TQObject + header "TMathBase.h" + // Should we marked textual because of inclusion libcpp_string_view.h, + // using macros to set up the header file. + textual header "RWrap_libcpp_string_view.h" -module "TQpDataBase.h" { header "TQpDataBase.h" export * } -module "TQpDataDens.h" { header "TQpDataDens.h" export * } -module "TQpDataSparse.h" { header "TQpDataSparse.h" export * } -module "TQpLinSolverBase.h" { header "TQpLinSolverBase.h" export * } -module "TQpLinSolverDens.h" { header "TQpLinSolverDens.h" export * } -module "TQpLinSolverSparse.h" { header "TQpLinSolverSparse.h" export * } -module "TQpProbBase.h" { header "TQpProbBase.h" export * } -module "TQpProbDens.h" { header "TQpProbDens.h" export * } -module "TQpProbSparse.h" { header "TQpProbSparse.h" export * } -module "TQpResidual.h" { header "TQpResidual.h" export * } -module "TQpSolverBase.h" { header "TQpSolverBase.h" export * } -module "TQpVar.h" { header "TQpVar.h" export * } -module "TQuaternion.h" { header "TQuaternion.h" export * } -module "TQueryResult.h" { header "TQueryResult.h" export * } -module "TQueryResultManager.h" { header "TQueryResultManager.h" export * } -module "TROOT.h" { header "TROOT.h" export * } -module "TRWLock.h" { header "TRWLock.h" export * } -module "TRandom.h" { header "TRandom.h" export * } -module "TRandom1.h" { header "TRandom1.h" export * } -module "TRandom2.h" { header "TRandom2.h" export * } -module "TRandom3.h" { header "TRandom3.h" export * } -module "TRealData.h" { header "TRealData.h" export * } -module "TRecorder.h" { header "TRecorder.h" export * } -module "TRedirectOutputGuard.h" { header "TRedirectOutputGuard.h" export * } -module "TRef.h" { header "TRef.h" export * } -module "TRefArray.h" { header "TRefArray.h" export * } -module "TRefArrayProxy.h" { header "TRefArrayProxy.h" export * } -module "TRefCnt.h" { header "TRefCnt.h" export * } -module "TRefProxy.h" { header "TRefProxy.h" export * } -module "TRefTable.h" { header "TRefTable.h" export * } -module "TRegexp.h" { header "TRegexp.h" export * } -module "TRemoteObject.h" { header "TRemoteObject.h" export * } -module "TResponseTable.h" { header "TResponseTable.h" export * } -module "TRint.h" { header "TRint.h" export * } -module "TRobustEstimator.h" { header "TRobustEstimator.h" export * } -module "TRolke.h" { header "TRolke.h" export * } -module "TRootApplication.h" { header "TRootApplication.h" export * } -module "TRootAuth.h" { header "TRootAuth.h" export * } -module "TRootBrowser.h" { header "TRootBrowser.h" export * } -module "TRootBrowserLite.h" { header "TRootBrowserLite.h" export * } -module "TRootCanvas.h" { header "TRootCanvas.h" export * } -module "TRootContextMenu.h" { header "TRootContextMenu.h" export * } -module "TRootControlBar.h" { header "TRootControlBar.h" export * } -module "TRootDialog.h" { header "TRootDialog.h" export * } -module "TRootEmbeddedCanvas.h" { header "TRootEmbeddedCanvas.h" export * } -module "TRootGuiBuilder.h" { header "TRootGuiBuilder.h" export * } -module "TRootGuiFactory.h" { header "TRootGuiFactory.h" export * } -module "TRootHelpDialog.h" { header "TRootHelpDialog.h" export * } -module "TRootIOCtor.h" { header "TRootIOCtor.h" export * } -module "TRootSecContext.h" { header "TRootSecContext.h" export * } -module "TRootSniffer.h" { header "TRootSniffer.h" export * } -module "TRootSnifferStore.h" { header "TRootSnifferStore.h" export * } -module "TRotMatrix.h" { header "TRotMatrix.h" export * } -module "TRotation.h" { header "TRotation.h" export * } -module "TS3HTTPRequest.h" { header "TS3HTTPRequest.h" export * } -module "TS3WebFile.h" { header "TS3WebFile.h" export * } -module "TSAXParser.h" { header "TSAXParser.h" export * } -module "TSPHE.h" { header "TSPHE.h" export * } -module "TSPlot.h" { header "TSPlot.h" export * } -module "TSQLClassInfo.h" { header "TSQLClassInfo.h" export * } -module "TSQLColumnInfo.h" { header "TSQLColumnInfo.h" export * } -module "TSQLFile.h" { header "TSQLFile.h" export * } -module "TSQLMonitoring.h" { header "TSQLMonitoring.h" export * } -module "TSQLObjectData.h" { header "TSQLObjectData.h" export * } -module "TSQLResult.h" { header "TSQLResult.h" export * } -module "TSQLRow.h" { header "TSQLRow.h" export * } -module "TSQLServer.h" { header "TSQLServer.h" export * } -module "TSQLStatement.h" { header "TSQLStatement.h" export * } -module "TSQLStructure.h" { header "TSQLStructure.h" export * } -module "TSQLTableInfo.h" { header "TSQLTableInfo.h" export * } -module "TSQLiteResult.h" { header "TSQLiteResult.h" export * } -module "TSQLiteRow.h" { header "TSQLiteRow.h" export * } -module "TSQLiteServer.h" { header "TSQLiteServer.h" export * } -module "TSQLiteStatement.h" { header "TSQLiteStatement.h" export * } -module "TSSLSocket.h" { header "TSSLSocket.h" export * } -module "TSVDUnfold.h" { header "TSVDUnfold.h" export * } -module "TSVG.h" { header "TSVG.h" export * } -module "TSchemaHelper.h" { header "TSchemaHelper.h" export * } -module "TSchemaRule.h" { header "TSchemaRule.h" export * } -module "TSchemaRuleProcessor.h" { header "TSchemaRuleProcessor.h" export * } -module "TSchemaRuleSet.h" { header "TSchemaRuleSet.h" export * } -module "TSchemaType.h" { header "TSchemaType.h" export * } -module "TSecContext.h" { header "TSecContext.h" export * } -module "TSelVerifyDataSet.h" { header "TSelVerifyDataSet.h" export * } -module "TSelector.h" { header "TSelector.h" export * } -module "TSelectorCint.h" { header "TSelectorCint.h" export * } -module "TSelectorDraw.h" { header "TSelectorDraw.h" export * } -module "TSelectorEntries.h" { header "TSelectorEntries.h" export * } -module "TSelectorList.h" { header "TSelectorList.h" export * } -module "TSelectorScalar.h" { header "TSelectorScalar.h" export * } -module "TSemaphore.h" { header "TSemaphore.h" export * } -module "TSeqCollection.h" { header "TSeqCollection.h" export * } -module "TServerSocket.h" { header "TServerSocket.h" export * } -module "TSessionDialogs.h" { header "TSessionDialogs.h" export * } -module "TSessionLogView.h" { header "TSessionLogView.h" export * } -module "TSessionViewer.h" { header "TSessionViewer.h" export * } -module "TShape.h" { header "TShape.h" export * } -module "TSlave.h" { header "TSlave.h" export * } -module "TSlaveLite.h" { header "TSlaveLite.h" export * } -module "TSlider.h" { header "TSlider.h" export * } -module "TSliderBox.h" { header "TSliderBox.h" export * } -module "TSocket.h" { header "TSocket.h" export * } -module "TSortedList.h" { header "TSortedList.h" export * } -module "TSpectrum.h" { header "TSpectrum.h" export * } -module "TSpectrum2.h" { header "TSpectrum2.h" export * } -module "TSpectrum2Fit.h" { header "TSpectrum2Fit.h" export * } -module "TSpectrum2Painter.h" { header "TSpectrum2Painter.h" export * } -module "TSpectrum2Transform.h" { header "TSpectrum2Transform.h" export * } -module "TSpectrum3.h" { header "TSpectrum3.h" export * } -module "TSpectrumFit.h" { header "TSpectrumFit.h" export * } -module "TSpectrumTransform.h" { header "TSpectrumTransform.h" export * } -module "TSpider.h" { header "TSpider.h" export * } -module "TSpiderEditor.h" { header "TSpiderEditor.h" export * } -module "TSpline.h" { header "TSpline.h" export * } -module "TStatistic.h" { header "TStatistic.h" export * } -module "TStatsFeedback.h" { header "TStatsFeedback.h" export * } -module "TStatus.h" { header "TStatus.h" export * } -module "TStopwatch.h" { header "TStopwatch.h" export * } -module "TStorage.h" { header "TStorage.h" export * } -module "TStreamer.h" { header "TStreamer.h" export * } -module "TStreamerElement.h" { header "TStreamerElement.h" export * } -module "TStreamerInfo.h" { header "TStreamerInfo.h" export * } -module "TStreamerInfoActions.h" { header "TStreamerInfoActions.h" export * } -module "TString.h" { header "TString.h" export * } -module "TStringLong.h" { header "TStringLong.h" export * } -module "TStyle.h" { header "TStyle.h" export * } -module "TStyleDialog.h" { header "TStyleDialog.h" export * } -module "TStyleManager.h" { header "TStyleManager.h" export * } -module "TStylePreview.h" { header "TStylePreview.h" export * } -module "TSynapse.h" { header "TSynapse.h" export * } -module "TSysEvtHandler.h" { header "TSysEvtHandler.h" export * } -module "TSystem.h" { header "TSystem.h" export * } -module "TSystemDirectory.h" { header "TSystemDirectory.h" export * } -module "TSystemFile.h" { header "TSystemFile.h" export * } -module "TTF.h" { header "TTF.h" export * } -module "TTRAP.h" { header "TTRAP.h" export * } -module "TTRD1.h" { header "TTRD1.h" export * } -module "TTRD2.h" { header "TTRD2.h" export * } -module "TTUBE.h" { header "TTUBE.h" export * } -module "TTUBS.h" { header "TTUBS.h" export * } -module "TTVLVContainer.h" { header "TTVLVContainer.h" export * } -module "TTVSession.h" { header "TTVSession.h" export * } -module "TTabCom.h" { header "TTabCom.h" export * } -module "TTable.h" { header "TTable.h" export * } -module "TTable3Points.h" { header "TTable3Points.h" export * } -module "TTableDescriptor.h" { header "TTableDescriptor.h" export * } -module "TTableIter.h" { header "TTableIter.h" export * } -module "TTableMap.h" { header "TTableMap.h" export * } -module "TTablePadView3D.h" { header "TTablePadView3D.h" export * } -module "TTablePoints.h" { header "TTablePoints.h" export * } -module "TTableSorter.h" { header "TTableSorter.h" export * } -module "TTask.h" { header "TTask.h" export * } -module "TTeXDump.h" { header "TTeXDump.h" export * } -module "TText.h" { header "TText.h" export * } -module "TTextEditor.h" { header "TTextEditor.h" export * } -module "TThread.h" { header "TThread.h" export * } -module "TThreadFactory.h" { header "TThreadFactory.h" export * } -module "TThreadImp.h" { header "TThreadImp.h" export * } -module "TThreadPool.h" { header "TThreadPool.h" export * } -module "TThreadSlots.h" { header "TThreadSlots.h" export * } -module "TTime.h" { header "TTime.h" export * } -module "TTimeStamp.h" { header "TTimeStamp.h" export * } -module "TTimer.h" { header "TTimer.h" export * } -module "TToggle.h" { header "TToggle.h" export * } -module "TToggleGroup.h" { header "TToggleGroup.h" export * } -module "TTree.h" { header "TTree.h" export * } -module "TTreeCache.h" { header "TTreeCache.h" export * } -module "TTreeCacheUnzip.h" { header "TTreeCacheUnzip.h" export * } -module "TTreeCloner.h" { header "TTreeCloner.h" export * } -module "TTreeDrawArgsParser.h" { header "TTreeDrawArgsParser.h" export * } -module "TTreeFormula.h" { header "TTreeFormula.h" export * } -module "TTreeFormulaManager.h" { header "TTreeFormulaManager.h" export * } -module "TTreeGeneratorBase.h" { header "TTreeGeneratorBase.h" export * } -module "TTreeIndex.h" { header "TTreeIndex.h" export * } -module "TTreeInput.h" { header "TTreeInput.h" export * } -module "TTreePerfStats.h" { header "TTreePerfStats.h" export * } -module "TTreePlayer.h" { header "TTreePlayer.h" export * } -module "TTreeProxyGenerator.h" { header "TTreeProxyGenerator.h" export * } -module "TTreeReader.h" { header "TTreeReader.h" export * } -module "TTreeReaderArray.h" { header "TTreeReaderArray.h" export * } -module "TTreeReaderGenerator.h" { header "TTreeReaderGenerator.h" export * } -module "TTreeReaderUtils.h" { header "TTreeReaderUtils.h" export * } -module "TTreeReaderValue.h" { header "TTreeReaderValue.h" export * } -module "TTreeResult.h" { header "TTreeResult.h" export * } -module "TTreeRow.h" { header "TTreeRow.h" export * } -module "TTreeSQL.h" { header "TTreeSQL.h" export * } -module "TTreeTableInterface.h" { header "TTreeTableInterface.h" export * } -module "TTreeViewer.h" { header "TTreeViewer.h" export * } -module "TUDPSocket.h" { header "TUDPSocket.h" export * } -module "TUUID.h" { header "TUUID.h" export * } -module "TUnfold.h" { header "TUnfold.h" export * } -module "TUnfoldBinning.h" { header "TUnfoldBinning.h" export * } -module "TUnfoldDensity.h" { header "TUnfoldDensity.h" export * } -module "TUnfoldSys.h" { header "TUnfoldSys.h" export * } -module "TUnixSystem.h" { header "TUnixSystem.h" export * } -module "TUnuran.h" { header "TUnuran.h" export * } -module "TUnuranBaseDist.h" { header "TUnuranBaseDist.h" export * } -module "TUnuranContDist.h" { header "TUnuranContDist.h" export * } -module "TUnuranDiscrDist.h" { header "TUnuranDiscrDist.h" export * } -module "TUnuranEmpDist.h" { header "TUnuranEmpDist.h" export * } -module "TUnuranMultiContDist.h" { header "TUnuranMultiContDist.h" export * } -module "TUnuranSampler.h" { header "TUnuranSampler.h" export * } -module "TUri.h" { header "TUri.h" export * } -module "TUrl.h" { header "TUrl.h" export * } -module "TVector.h" { header "TVector.h" export * } -module "TVector2.h" { header "TVector2.h" export * } -module "TVector3.h" { header "TVector3.h" export * } -module "TVectorD.h" { header "TVectorD.h" export * } -module "TVectorDfwd.h" { header "TVectorDfwd.h" export * } -module "TVectorF.h" { header "TVectorF.h" export * } -module "TVectorFfwd.h" { header "TVectorFfwd.h" export * } -module "TVectorT.h" { header "TVectorT.h" export * } -module "TVectorfwd.h" { header "TVectorfwd.h" export * } -module "TVersionCheck.h" { header "TVersionCheck.h" export * } -module "TView.h" { header "TView.h" export * } -module "TView3D.h" { header "TView3D.h" export * } -module "TViewer3DPad.h" { header "TViewer3DPad.h" export * } -module "TVirtualArray.h" { header "TVirtualArray.h" export * } -module "TVirtualAuth.h" { header "TVirtualAuth.h" export * } -module "TVirtualCollectionIterators.h" { header "TVirtualCollectionIterators.h" export * } -module "TVirtualCollectionProxy.h" { header "TVirtualCollectionProxy.h" export * } -module "TVirtualDragManager.h" { header "TVirtualDragManager.h" export * } -module "TVirtualFFT.h" { header "TVirtualFFT.h" export * } -module "TVirtualFitter.h" { header "TVirtualFitter.h" export * } -module "TVirtualGL.h" { header "TVirtualGL.h" export * } -module "TVirtualGeoPainter.h" { header "TVirtualGeoPainter.h" export * } -module "TVirtualGeoTrack.h" { header "TVirtualGeoTrack.h" export * } -module "TVirtualGraphPainter.h" { header "TVirtualGraphPainter.h" export * } -module "TVirtualHistPainter.h" { header "TVirtualHistPainter.h" export * } -module "TVirtualIndex.h" { header "TVirtualIndex.h" export * } -module "TVirtualIsAProxy.h" { header "TVirtualIsAProxy.h" export * } -module "TVirtualMC.h" { header "TVirtualMC.h" export * } -module "TVirtualMCApplication.h" { header "TVirtualMCApplication.h" export * } -module "TVirtualMCDecayer.h" { header "TVirtualMCDecayer.h" export * } -module "TVirtualMCGeometry.h" { header "TVirtualMCGeometry.h" export * } -module "TVirtualMCStack.h" { header "TVirtualMCStack.h" export * } -module "TVirtualMagField.h" { header "TVirtualMagField.h" export * } -module "TVirtualMonitoring.h" { header "TVirtualMonitoring.h" export * } -module "TVirtualMutex.h" { header "TVirtualMutex.h" export * } -module "TVirtualObject.h" { header "TVirtualObject.h" export * } -module "TVirtualPS.h" { header "TVirtualPS.h" export * } -module "TVirtualPacketizer.h" { header "TVirtualPacketizer.h" export * } -module "TVirtualPad.h" { header "TVirtualPad.h" export * } -module "TVirtualPadEditor.h" { header "TVirtualPadEditor.h" export * } -module "TVirtualPadPainter.h" { header "TVirtualPadPainter.h" export * } -module "TVirtualPerfStats.h" { header "TVirtualPerfStats.h" export * } -module "TVirtualProofPlayer.h" { header "TVirtualProofPlayer.h" export * } -module "TVirtualRefProxy.h" { header "TVirtualRefProxy.h" export * } -module "TVirtualStreamerInfo.h" { header "TVirtualStreamerInfo.h" export * } -module "TVirtualTableInterface.h" { header "TVirtualTableInterface.h" export * } -module "TVirtualTreePlayer.h" { header "TVirtualTreePlayer.h" export * } -module "TVirtualViewer3D.h" { header "TVirtualViewer3D.h" export * } -module "TVirtualX.h" { header "TVirtualX.h" export * } -module "TVolume.h" { header "TVolume.h" export * } -module "TVolumePosition.h" { header "TVolumePosition.h" export * } -module "TVolumeView.h" { header "TVolumeView.h" export * } -module "TVolumeViewIter.h" { header "TVolumeViewIter.h" export * } -module "TWbox.h" { header "TWbox.h" export * } -module "TWebFile.h" { header "TWebFile.h" export * } -module "TXMLAttr.h" { header "TXMLAttr.h" export * } -module "TXMLDocument.h" { header "TXMLDocument.h" export * } -module "TXMLEngine.h" { header "TXMLEngine.h" export * } -module "TXMLFile.h" { header "TXMLFile.h" export * } -module "TXMLNode.h" { header "TXMLNode.h" export * } -module "TXMLParser.h" { header "TXMLParser.h" export * } -module "TXMLPlayer.h" { header "TXMLPlayer.h" export * } -module "TXMLSetup.h" { header "TXMLSetup.h" export * } -module "TXTRU.h" { header "TXTRU.h" export * } -module "TZIPFile.h" { header "TZIPFile.h" export * } -module "ThreadLocalStorage.h" { header "ThreadLocalStorage.h" export * } -module "TreeUtils.h" { header "TreeUtils.h" export * } -module "Ttypes.h" { header "Ttypes.h" export * } -module "Varargs.h" { header "Varargs.h" export * } -module "WidgetMessageTypes.h" { header "WidgetMessageTypes.h" export * } -module "Windows4Root.h" { header "Windows4Root.h" export * } -module "X11Atoms.h" { header "X11Atoms.h" export * } -module "X11Buffer.h" { header "X11Buffer.h" export * } -module "X11Colors.h" { header "X11Colors.h" export * } -module "X11Drawable.h" { header "X11Drawable.h" export * } -module "X11Events.h" { header "X11Events.h" export * } -module "X3DBuffer.h" { header "X3DBuffer.h" export * } -module "XLFDParser.h" { header "XLFDParser.h" export * } -module "ZipLZMA.h" { header "ZipLZMA.h" export * } -module "cfortran.h" [extern_c] { header "cfortran.h" export * } -module "config.h" { header "config.h" export * } -//module "libcpp_string_view.h" { header "libcpp_string_view.h" export * } // see RWrap_libcpp_string_view -module "mmalloc.h" { header "mmalloc.h" export * } -module "mmconfig.h" { header "mmconfig.h" export * } -module "mmprivate.h" { header "mmprivate.h" export * } -module "pq2actions.h" { header "pq2actions.h" export * } -module "pq2ping.h" { header "pq2ping.h" export * } -module "pq2wrappers.h" { header "pq2wrappers.h" export * } -module "proofdp.h" { header "proofdp.h" export * } -module "redirguard.h" { header "redirguard.h" export * } -module "root_std_complex.h" { header "root_std_complex.h" export * } -module "rootdp.h" { header "rootdp.h" export * } -module "rpdconn.h" { header "rpdconn.h" export * } -module "rpddefs.h" { header "rpddefs.h" export * } -module "rpderr.h" { header "rpderr.h" export * } -module "rpdp.h" { header "rpdp.h" export * } -module "rpdpriv.h" { header "rpdpriv.h" export * } -module "rsaaux.h" { header "rsaaux.h" export * } -module "rsadef.h" { header "rsadef.h" export * } -module "rsafun.h" { header "rsafun.h" export * } -module "rsalib.h" { header "rsalib.h" export * } -module "snprintf.h" { header "snprintf.h" export * } -module "strlcpy.h" { header "strlcpy.h" export * } -module "tableDescriptor.h" { header "tableDescriptor.h" export * } -module v5 { - umbrella "v5" - module * { export * } + export * } diff --git a/cmake/modules/RootNewMacros.cmake b/cmake/modules/RootNewMacros.cmake index 4f906e604ff0a..0b1d0288d3db6 100644 --- a/cmake/modules/RootNewMacros.cmake +++ b/cmake/modules/RootNewMacros.cmake @@ -72,11 +72,18 @@ include(CMakeParseArguments) #---ROOT_GLOB_FILES( [REALTIVE path] [FILTER regexp] ...) #--------------------------------------------------------------------------------------------------- function(ROOT_GLOB_FILES variable) - CMAKE_PARSE_ARGUMENTS(ARG "" "RELATIVE;FILTER" "" ${ARGN}) + # FIXME: RECURSE switch should be passed without an option. Eg. + # ROOT_GLOB_FILES(var RECURSE ...). Currently we have to call it with + # ROOT_GLOB_FILES(var RECURSE 1 ...). + CMAKE_PARSE_ARGUMENTS(ARG "" "RECURSE;RELATIVE;FILTER" "" ${ARGN}) + set(_possibly_recurse "") + if (ARG_RECURSE) + set(_possibly_recurse "_RECURSE") + endif() if(ARG_RELATIVE) - file(GLOB _sources RELATIVE ${ARG_RELATIVE} ${ARG_UNPARSED_ARGUMENTS}) + file(GLOB${_possibly_recurse} _sources RELATIVE ${ARG_RELATIVE} ${ARG_UNPARSED_ARGUMENTS}) else() - file(GLOB _sources ${ARG_UNPARSED_ARGUMENTS}) + file(GLOB${_possibly_recurse} _sources ${ARG_UNPARSED_ARGUMENTS}) endif() if(ARG_FILTER) foreach(s ${_sources}) @@ -369,8 +376,73 @@ function(ROOT_GENERATE_DICTIONARY dictionary) DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libraries) endif() endif() + if(cxxmodules) + # We build libSmatrix and libGenVector for 32 and 64 bits. Both contain the + # same header files, ignore the 32 bit version and make the module unique. + if(NOT ${dictionary} MATCHES .*32 ) + ROOT_CXXMODULES_APPEND_TO_MODULEMAP("${library_name}" "${rheaderfiles}") + endif() + endif(cxxmodules) endfunction() +#--------------------------------------------------------------------------------------------------- +#---ROOT_CXXMODULES_APPEND_TO_MODULEMAP( library library_headers ) +#--------------------------------------------------------------------------------------------------- +function (ROOT_CXXMODULES_APPEND_TO_MODULEMAP library library_headers) + if(NOT cxxmodules) + message(FATAL_ERROR "Calling ROOT_CXXMODULES_APPEND_TO_MODULEMAP on non-modules build.") + endif() + + ROOT_FIND_DIRS_WITH_HEADERS(dirs) + + # Variable 'dirs' is the return result of ROOT_FIND_DIRS_WITH_HEADERS. + if(NOT DEFINED dirs) + message(SEND_ERROR "Error, the variable ${dirs} is not defined!") + endif() + + set(found_headers "") + set(dir_headers "") + foreach(d ${dirs}) + ROOT_GLOB_FILES(dir_headers + RECURSE 1 + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${d} + FILTER "LinkDef" ${d}/*) + list(APPEND found_headers "${dir_headers}") + endforeach() + + set(excluded_headers "RConversionRuleParser.h RConfig.h RVersion.h RtypesImp.h + Rtypes.h RtypesCore.h TClassEdit.h TMetaUtils.h + TSchemaType.h DllImport.h Rtypeinfo.h TGenericClassInfo.h + TSchemaHelper.h ESTLType.h RStringView.h Varargs.h + RootMetaSelection.h TString.h Riosfwd.h TMathBase.h + RWrap_libcpp_string_view.h TAtomicCountGcc.h + TException.h ROOT/TThreadExecutor.hxx + TBranchProxyTemplate.h TGLIncludes.h TGLWSIncludes.h + snprintf.h strlcpy.h") + set(modulemap_entry "module \"${library}\" { \\n") + # For modules GCocoa and GQuartz we need objc context. + if (${library} MATCHES "(libGCocoa|libGQuartz)\..*") + set (modulemap_entry "${modulemap_entry} \\n requires objc \\n") + else() + set (modulemap_entry "${modulemap_entry} \\n requires cplusplus \\n") + endif() + if (library_headers) + set(found_headers ${library_headers}) + endif() + foreach(header ${found_headers}) + #message (STATUS "header: ${header}") + set(textual_header "") + if (${header} MATCHES ".*\.icc$") + set(textual_header " textual") + endif() + if (NOT ${excluded_headers} MATCHES ${header}) + set(modulemap_entry "${modulemap_entry} ${textual_header} header \"${header}\"\\n") + endif() + endforeach() + #set(modulemap_entry "${modulemap_entry} link \"lib/${library}\"\\n") + set(modulemap_entry "${modulemap_entry} export *\\n }\\n") + set_property(GLOBAL APPEND PROPERTY ROOT_CXXMODULES_EXTRA_MODULEMAP_CONTENT ${modulemap_entry}) +endfunction() #--------------------------------------------------------------------------------------------------- #---ROOT_LINKER_LIBRARY( source1 source2 ...[TYPE STATIC|SHARED] [DLLEXPORT] @@ -603,12 +675,11 @@ function(ROOT_GENERATE_ROOTMAP library) endfunction() #--------------------------------------------------------------------------------------------------- -#---ROOT_INSTALL_HEADERS([dir1 dir2 ...] OPTIONS [options]) +#---ROOT_FIND_DIRS_WITH_HEADERS([dir1 dir2 ...] OPTIONS [options]) #--------------------------------------------------------------------------------------------------- -function(ROOT_INSTALL_HEADERS) - CMAKE_PARSE_ARGUMENTS(ARG "" "" "OPTIONS" ${ARGN}) - if( ARG_UNPARSED_ARGUMENTS ) - set(dirs ${ARG_UNPARSED_ARGUMENTS}) +function(ROOT_FIND_DIRS_WITH_HEADERS result_dirs) + if( ARGN ) + set(dirs ${ARGN}) else() set(dirs inc/) if(root7) @@ -617,6 +688,15 @@ function(ROOT_INSTALL_HEADERS) endif() endif() endif() + set (${result_dirs} ${dirs} PARENT_SCOPE) +endfunction() + +#--------------------------------------------------------------------------------------------------- +#---ROOT_INSTALL_HEADERS([dir1 dir2 ...] OPTIONS [options]) +#--------------------------------------------------------------------------------------------------- +function(ROOT_INSTALL_HEADERS) + CMAKE_PARSE_ARGUMENTS(ARG "" "" "OPTIONS" ${ARGN}) + ROOT_FIND_DIRS_WITH_HEADERS(dirs ${ARG_UNPARSED_ARGUMENTS}) foreach(d ${dirs}) install(DIRECTORY ${d} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT headers diff --git a/core/base/CMakeLists.txt b/core/base/CMakeLists.txt index ab8be0a87ff81..6e059d18b60aa 100644 --- a/core/base/CMakeLists.txt +++ b/core/base/CMakeLists.txt @@ -6,7 +6,6 @@ ROOT_GLOB_HEADERS(Base_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/T*.h ${CMAKE_CURRENT_SOURCE_DIR}/inc/GuiTypes.h ${CMAKE_CURRENT_SOURCE_DIR}/inc/KeySymbols.h ${CMAKE_CURRENT_SOURCE_DIR}/inc/Buttons.h) - if(root7) set(root7src v7/src/*.cxx) ROOT_GLOB_HEADERS(Base_v7_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/v7/inc/ROOT/T*.hxx) diff --git a/core/base/Module.mk b/core/base/Module.mk index 0ce918e06ea47..f26d332c0d4a3 100644 --- a/core/base/Module.mk +++ b/core/base/Module.mk @@ -38,7 +38,8 @@ BASEO := $(call stripsrc,$(BASES:.cxx=.o)) BASEDEP := $(BASEO:.o=.d) $(ROOTAO:.o=.d) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%,include/%,$(BASEH)) +BASEH_REL := $(patsubst $(MODDIRI)/%,include/%,$(BASEH)) +ALLHDRS += $(BASEH_REL) # include all dependency files INCLUDEFILES += $(BASEDEP) diff --git a/core/cont/Module.mk b/core/cont/Module.mk index d5e641a220e7c..60239c04a77b9 100644 --- a/core/cont/Module.mk +++ b/core/cont/Module.mk @@ -23,7 +23,8 @@ CONTO := $(call stripsrc,$(CONTS:.cxx=.o)) CONTDEP := $(CONTO:.o=.d) $(CONTDO:.o=.d) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%,include/%,$(CONTH)) +CONTH_REL := $(patsubst $(MODDIRI)/%,include/%,$(CONTH)) +ALLHDRS += $(CONTH_REL) # include all dependency files INCLUDEFILES += $(CONTDEP) diff --git a/core/meta/Module.mk b/core/meta/Module.mk index d41fb9983203f..f4acf910a4251 100644 --- a/core/meta/Module.mk +++ b/core/meta/Module.mk @@ -61,7 +61,8 @@ ALLLIBS += $(CLINGLIB) ALLMAPS += $(CLINGMAP) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(METAH)) +METAH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(METAH)) +ALLHDRS += $(METAH_REL) # include all dependency files INCLUDEFILES += $(METADEP) diff --git a/core/metautils/Module.mk b/core/metautils/Module.mk index 4a10eba853a5d..3bf56d3ef3766 100644 --- a/core/metautils/Module.mk +++ b/core/metautils/Module.mk @@ -41,7 +41,8 @@ METAUTILSL := $(MODDIRI)/LinkDef.h METAUTILSDEP := $(METAUTILSO:.o=.d) $(METAUTILSTO:.o=.d) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(METAUTILSH) $(METAUTILSTH)) +METAUTILSH_REL := $(patsubst $(MODDIRI)/%,include/%,$(METAUTILSH) $(METAUTILSTH)) +ALLHDRS += $(METAUTILSH_REL) # include all dependency files INCLUDEFILES += $(METAUTILSDEP) diff --git a/core/thread/Module.mk b/core/thread/Module.mk index 18bfaaccf7eb4..8a09db21d972d 100644 --- a/core/thread/Module.mk +++ b/core/thread/Module.mk @@ -71,9 +71,18 @@ THREADLIB := $(LPATH)/libThread.$(SOEXT) THREADMAP := $(THREADLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%,include/%,$(THREADH) $(THREADH_EXT)) +THREADH_REL := $(patsubst $(MODDIRI)/%,include/%,$(THREADH)) +ALLHDRS += $(THREADH_REL) $(patsubst $(MODDIRI)/%,include/%, $(THREADH_EXT)) ALLLIBS += $(THREADLIB) ALLMAPS += $(THREADMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(THREADH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Core_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(THREADLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif CXXFLAGS += $(OSTHREADFLAG) CFLAGS += $(OSTHREADFLAG) diff --git a/geom/gdml/Module.mk b/geom/gdml/Module.mk index e1a2531e9d642..b89d82f008424 100644 --- a/geom/gdml/Module.mk +++ b/geom/gdml/Module.mk @@ -28,9 +28,18 @@ GDMLLIB := $(LPATH)/libGdml.$(SOEXT) GDMLMAP := $(GDMLLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GDMLH)) +GDMLH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GDMLH)) +ALLHDRS += $(GDMLH_REL) ALLLIBS += $(GDMLLIB) ALLMAPS += $(GDMLMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GDMLH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Geom_GDML { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GDMLLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GDMLDEP) diff --git a/geom/geocad/Module.mk b/geom/geocad/Module.mk index 955076b5991ae..4eb269119a033 100644 --- a/geom/geocad/Module.mk +++ b/geom/geocad/Module.mk @@ -7,7 +7,7 @@ MODNAME := geocad MODDIR := $(ROOT_SRCDIR)/geom/$(MODNAME) MODDIRS := $(MODDIR)/src MODDIRI := $(MODDIR)/inc - + GEOCADDIR := $(MODDIR) GEOCADDIRS := $(GEOCADDIR)/src GEOCADDIRI := $(GEOCADDIR)/inc @@ -32,9 +32,18 @@ GEOCADLIB := $(LPATH)/libGeoCad.$(SOEXT) GEOCADMAP := $(GEOCADLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEOCADH)) +GEOCADH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEOCADH)) +ALLHDRS += $(GEOCADH_REL) ALLLIBS += $(GEOCADLIB) ALLMAPS += $(GEOCADMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GEOCADH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Geom_GeoCad { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GEOCADHLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GEOCADDEP) diff --git a/geom/geom/Module.mk b/geom/geom/Module.mk index d8d0b7333ed5f..70c530cc9a647 100644 --- a/geom/geom/Module.mk +++ b/geom/geom/Module.mk @@ -48,9 +48,19 @@ GEOMLIB := $(LPATH)/libGeom.$(SOEXT) GEOMMAP := $(GEOMLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEOMH)) +GEOMH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEOMH)) +ALLHDRS += $(GEOMH_REL) ALLLIBS += $(GEOMLIB) ALLMAPS += $(GEOMMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GEOMH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Geom_Geom { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GEOMLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif + # include all dependency files INCLUDEFILES += $(GEOMDEP) diff --git a/geom/geombuilder/Module.mk b/geom/geombuilder/Module.mk index 9f9b7261fa70c..5d9af8e4ea36c 100644 --- a/geom/geombuilder/Module.mk +++ b/geom/geombuilder/Module.mk @@ -35,9 +35,19 @@ GEOMBUILDERLIB := $(LPATH)/libGeomBuilder.$(SOEXT) GEOMBUILDERMAP := $(GEOMBUILDERLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEOMBUILDERH)) +GEOMBUILDERH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEOMBUILDERH)) +ALLHDRS += $(GEOMBUILDERH_REL) ALLLIBS += $(GEOMBUILDERLIB) ALLMAPS += $(GEOMBUILDERMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GEOMBUILDERH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Geom_GeomBuilder { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GEOMBUILDERLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif + # include all dependency files INCLUDEFILES += $(GEOMBUILDERDEP) diff --git a/geom/geompainter/Module.mk b/geom/geompainter/Module.mk index c73908ded25e1..02d6636b7ecf1 100644 --- a/geom/geompainter/Module.mk +++ b/geom/geompainter/Module.mk @@ -29,9 +29,18 @@ GEOMPAINTERLIB := $(LPATH)/libGeomPainter.$(SOEXT) GEOMPAINTERMAP := $(GEOMPAINTERLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEOMPAINTERH)) +GEOMPAINTERH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEOMPAINTERH)) +ALLHDRS += $(GEOMPAINTERH_REL) ALLLIBS += $(GEOMPAINTERLIB) ALLMAPS += $(GEOMPAINTERMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GEOMPAINTERH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Geom_GeomPainter { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GEOMPAINTERLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GEOMPAINTERDEP) diff --git a/graf2d/asimage/Module.mk b/graf2d/asimage/Module.mk index a1cf3607ab359..f679e8391cfa3 100644 --- a/graf2d/asimage/Module.mk +++ b/graf2d/asimage/Module.mk @@ -87,10 +87,20 @@ ASIMAGEGUILIB := $(LPATH)/libASImageGui.$(SOEXT) ASIMAGEGUIMAP := $(ASIMAGEGUILIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ASIMAGEH)) -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ASIMAGEGUIH)) +ASIMAGE_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(ASIMAGEH) $(ASIMAGEGUIH)) +ALLHDRS += $(ASIMAGE_REL) ALLLIBS += $(ASIMAGELIB) $(ASIMAGEGUILIB) ALLMAPS += $(ASIMAGEMAP) $(ASIMAGEGUIMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(ASIMAGE_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(ASIMAGELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += link \"$(ASIMAGEGUILIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif + # include all dependency files INCLUDEFILES += $(ASIMAGEDEP) $(ASIMAGEGUIDEP) diff --git a/graf2d/cocoa/Module.mk b/graf2d/cocoa/Module.mk index f1e355556bc16..b74bf83729567 100644 --- a/graf2d/cocoa/Module.mk +++ b/graf2d/cocoa/Module.mk @@ -36,9 +36,19 @@ COCOALIB := $(LPATH)/libGCocoa.$(SOEXT) COCOAMAP := $(COCOALIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(COCOAH)) +COCOAH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(COCOAH)) +ALLHDRS += $(COCOAH_REL) ALLLIBS += $(COCOALIB) ALLMAPS += $(COCOAMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(COCOAH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += requires objc \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(COCOALIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(COCOADEP) diff --git a/graf2d/fitsio/Module.mk b/graf2d/fitsio/Module.mk index 276d6deedb8ed..616be07fc38d3 100644 --- a/graf2d/fitsio/Module.mk +++ b/graf2d/fitsio/Module.mk @@ -28,9 +28,18 @@ FITSIOLIB := $(LPATH)/libFITSIO.$(SOEXT) FITSIOMAP := $(FITSIOLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(FITSIOH)) +FITSIOH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(FITSIOH)) +ALLHDRS += $(FITSIOH_REL) ALLLIBS += $(FITSIOLIB) ALLMAPS += $(FITSIOMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(FITSIOH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(FITSIOLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(FITSIODEP) diff --git a/graf2d/gpad/Module.mk b/graf2d/gpad/Module.mk index 62b9da1fbc7cf..f27ac3cbf2b7e 100644 --- a/graf2d/gpad/Module.mk +++ b/graf2d/gpad/Module.mk @@ -28,9 +28,18 @@ GPADLIB := $(LPATH)/libGpad.$(SOEXT) GPADMAP := $(GPADLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GPADH)) +GPADH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GPADH)) +ALLHDRS += $(GPADH_REL) ALLLIBS += $(GPADLIB) ALLMAPS += $(GPADMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GPADH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GPADLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GPADDEP) diff --git a/graf2d/graf/Module.mk b/graf2d/graf/Module.mk index 05302b59b400c..5d7b585b702ce 100644 --- a/graf2d/graf/Module.mk +++ b/graf2d/graf/Module.mk @@ -28,9 +28,18 @@ GRAFLIB := $(LPATH)/libGraf.$(SOEXT) GRAFMAP := $(GRAFLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GRAFH)) +GRAFH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GRAFH)) +ALLHDRS += $(GRAFH_REL) ALLLIBS += $(GRAFLIB) ALLMAPS += $(GRAFMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GRAFH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Grad2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GRAFLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GRAFDEP) diff --git a/graf2d/gviz/Module.mk b/graf2d/gviz/Module.mk index 618f60a030855..07cc49262ad8f 100644 --- a/graf2d/gviz/Module.mk +++ b/graf2d/gviz/Module.mk @@ -28,9 +28,18 @@ GVIZLIB := $(LPATH)/libGviz.$(SOEXT) GVIZMAP := $(GVIZLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GVIZH)) +GVIZH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GVIZH)) +ALLHDRS += $(GVIZH_REL) ALLLIBS += $(GVIZLIB) ALLMAPS += $(GVIZMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GVIZH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GVIZLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GVIZDEP) diff --git a/graf2d/ios/Module.mk b/graf2d/ios/Module.mk index 0b99530371c39..532e97e04dd20 100644 --- a/graf2d/ios/Module.mk +++ b/graf2d/ios/Module.mk @@ -20,7 +20,15 @@ IOSO := $(call stripsrc,$(IOSS:.cxx=.o)) IOSDEP := $(IOSO:.o=.d) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(IOSH)) +IOSH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(IOSH)) +ALLHDRS += $(IOSH_REL) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(IOSH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(IOSDEP) diff --git a/graf2d/postscript/Module.mk b/graf2d/postscript/Module.mk index cbf3804534252..b0669b22a117a 100644 --- a/graf2d/postscript/Module.mk +++ b/graf2d/postscript/Module.mk @@ -28,9 +28,18 @@ POSTSCRIPTLIB := $(LPATH)/libPostscript.$(SOEXT) POSTSCRIPTMAP := $(POSTSCRIPTLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(POSTSCRIPTH)) +POSTSCRIPTH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(POSTSCRIPTH)) +ALLHDRS += $(POSTSCRIPTH_REL) ALLLIBS += $(POSTSCRIPTLIB) ALLMAPS += $(POSTSCRIPTMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(POSTSCRIPTH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Core_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(POSTSCRIPTLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(POSTSCRIPTDEP) diff --git a/graf2d/qt/Module.mk b/graf2d/qt/Module.mk index f0b552fcc5884..1bd6232960bbd 100644 --- a/graf2d/qt/Module.mk +++ b/graf2d/qt/Module.mk @@ -67,11 +67,20 @@ QMAKERULES += $(GQTDIRI)/rootcint.pri $(GQTDIRI)/rootcintrule.pri \ $(GQTDIRI)/rootlibs.pri # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GQTH)) +GQTH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GQTH)) +ALLHDRS += $(GQTH_REL) ALLHDRS += $(patsubst $(MODDIRI)/%.cw,include/%.cw,$(QCUSTOMWIDGETS)) ALLHDRS += $(patsubst $(MODDIRI)/%.pri,include/%.pri,$(QMAKERULES)) ALLLIBS += $(GQTLIB) ALLMAPS += $(GQTMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GQTH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Qt_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GQTLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GQTDEP) diff --git a/graf2d/quartz/Module.mk b/graf2d/quartz/Module.mk index a106cee525daf..8a583ae3b907f 100644 --- a/graf2d/quartz/Module.mk +++ b/graf2d/quartz/Module.mk @@ -36,9 +36,20 @@ QUARTZLIB := $(LPATH)/libGQuartz.$(SOEXT) QUARTZMAP := $(QUARTZLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(QUARTZH)) +QUARTZH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(QUARTZH)) +ALLHDRS += $(QUARTZH_REL) ALLLIBS += $(QUARTZLIB) ALLMAPS += $(QUARTZMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(QUARTZH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Qt_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += requires objc \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(QUARTZLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif + # include all dependency files INCLUDEFILES += $(QUARTZDEP) diff --git a/graf2d/win32gdk/Module.mk b/graf2d/win32gdk/Module.mk index 16a3ac926b8cb..01c7c93a49e23 100644 --- a/graf2d/win32gdk/Module.mk +++ b/graf2d/win32gdk/Module.mk @@ -78,9 +78,18 @@ GDKLIBS := $(GLIBLIB) GDKDLLS := $(GLIBDLL) $(ICONVDLL) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(WIN32GDKH)) +WIN32GDKH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(WIN32GDKH)) +ALLHDRS += $(WIN32GDKH_REL) ALLLIBS += $(WIN32GDKLIB) ALLMAPS += $(WIN32GDKMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(WIN32GDKH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(WIN32GDKLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(WIN32GDKDEP) diff --git a/graf2d/x11/Module.mk b/graf2d/x11/Module.mk index dc05e8f2fc22e..ca8408a417f76 100644 --- a/graf2d/x11/Module.mk +++ b/graf2d/x11/Module.mk @@ -30,9 +30,18 @@ X11LIB := $(LPATH)/libGX11.$(SOEXT) X11MAP := $(X11LIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(X11H)) +X11H_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(X11H)) +ALLHDRS += $(X11H_REL) ALLLIBS += $(X11LIB) ALLMAPS += $(X11MAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(X11H_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(X11LIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(X11DEP) diff --git a/graf2d/x11ttf/Module.mk b/graf2d/x11ttf/Module.mk index b6b1959175767..8d68539a353d4 100644 --- a/graf2d/x11ttf/Module.mk +++ b/graf2d/x11ttf/Module.mk @@ -28,9 +28,18 @@ X11TTFLIB := $(LPATH)/libGX11TTF.$(SOEXT) X11TTFMAP := $(X11TTFLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(X11TTFH)) +X11TTFH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(X11TTFH)) +ALLHDRS += $(X11TTFH_REL) ALLLIBS += $(X11TTFLIB) ALLMAPS += $(X11TTFMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(X11TTFH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf2d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(X11TTFLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(X11TTFDEP) diff --git a/graf3d/eve/Module.mk b/graf3d/eve/Module.mk index cd0a1d5bf1db8..8965fb5c31b5d 100644 --- a/graf3d/eve/Module.mk +++ b/graf3d/eve/Module.mk @@ -48,9 +48,18 @@ EVELIB := $(LPATH)/libEve.$(SOEXT) EVEMAP := $(EVELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(EVEH)) +EVEH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(EVEH)) +ALLHDRS += $(EVEH_REL) ALLLIBS += $(EVELIB) ALLMAPS += $(EVEMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(EVEH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf3d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(EVELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(EVEDEP) diff --git a/graf3d/g3d/Module.mk b/graf3d/g3d/Module.mk index 6612a43865e88..d85c3d3872890 100644 --- a/graf3d/g3d/Module.mk +++ b/graf3d/g3d/Module.mk @@ -33,9 +33,18 @@ G3DLIB := $(LPATH)/libGraf3d.$(SOEXT) G3DMAP := $(G3DLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(G3DH)) +G3DH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(G3DH)) +ALLHDRS += $(G3DH_REL) ALLLIBS += $(G3DLIB) ALLMAPS += $(G3DMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(G3DH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graf3d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(G3DLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(G3DDEP) diff --git a/graf3d/gl/Module.mk b/graf3d/gl/Module.mk index 25149c32f488c..7ae59152a9401 100644 --- a/graf3d/gl/Module.mk +++ b/graf3d/gl/Module.mk @@ -67,9 +67,18 @@ GLLIB := $(LPATH)/libRGL.$(SOEXT) GLMAP := $(GLLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GLH)) +GLH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GLH)) +ALLHDRS += $(GLH_REL) ALLLIBS += $(GLLIB) ALLMAPS += $(GLMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GLH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graph3d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GLLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GLDEP) diff --git a/graf3d/glew/Module.mk b/graf3d/glew/Module.mk index c3dfe1fbfabbe..5de964c713daa 100644 --- a/graf3d/glew/Module.mk +++ b/graf3d/glew/Module.mk @@ -22,8 +22,17 @@ GLEWDEP := $(GLEWO:.o=.d) GLEWLIB := $(LPATH)/libGLEW.$(SOEXT) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GLEWH)) +GLEWH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GLEWH)) +ALLHDRS += $(GLEWH_REL) ALLLIBS += $(GLEWLIB) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,exclude header \"%\"\\n,$(GLEWH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graph3d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GLEWLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GLEWDEP) diff --git a/graf3d/gviz3d/Module.mk b/graf3d/gviz3d/Module.mk index 326694ab11f10..d7ca79c4e74b7 100644 --- a/graf3d/gviz3d/Module.mk +++ b/graf3d/gviz3d/Module.mk @@ -28,9 +28,18 @@ GVIZ3DLIB := $(LPATH)/libGviz3d.$(SOEXT) GVIZ3DMAP := $(GVIZ3DLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GVIZ3DH)) +GVIZ3DH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GVIZ3DH)) +ALLHDRS += $(GVIZ3DH_REL) ALLLIBS += $(GVIZ3DLIB) ALLMAPS += $(GVIZ3DMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GVIZ3DH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graph3d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GVIZ3DLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GVIZ3DDEP) diff --git a/graf3d/x3d/Module.mk b/graf3d/x3d/Module.mk index d562776a8d923..6b58716c69348 100644 --- a/graf3d/x3d/Module.mk +++ b/graf3d/x3d/Module.mk @@ -31,9 +31,18 @@ X3DLIB := $(LPATH)/libX3d.$(SOEXT) X3DMAP := $(X3DLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(X3DH)) +X3DH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(X3DH)) +ALLHDRS += $(X3DH_REL) ALLLIBS += $(X3DLIB) ALLMAPS += $(X3DMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(X3DH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Graph3d_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(X3DLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(X3DDEP) diff --git a/gui/fitpanel/Module.mk b/gui/fitpanel/Module.mk index 78b81e440c182..ef481c416457f 100644 --- a/gui/fitpanel/Module.mk +++ b/gui/fitpanel/Module.mk @@ -28,9 +28,18 @@ FITPANELLIB := $(LPATH)/libFitPanel.$(SOEXT) FITPANELMAP := $(FITPANELLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(FITPANELH)) +FITPANELH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(FITPANELH)) +ALLHDRS += $(FITPANELH_REL) ALLLIBS += $(FITPANELLIB) ALLMAPS += $(FITPANELMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(FITPANELH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Gui_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(FITPANELLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(FITPANELDEP) diff --git a/gui/ged/Module.mk b/gui/ged/Module.mk index e92bc2ec12d1e..e609714a7b02c 100644 --- a/gui/ged/Module.mk +++ b/gui/ged/Module.mk @@ -28,9 +28,18 @@ GEDLIB := $(LPATH)/libGed.$(SOEXT) GEDMAP := $(GEDLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEDH)) +GEDH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GEDH)) +ALLHDRS += $(GEDH_REL) ALLLIBS += $(GEDLIB) ALLMAPS += $(GEDMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GEDH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Gui_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GEDLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GEDDEP) diff --git a/gui/gui/Module.mk b/gui/gui/Module.mk index aeae79e321e23..7d90694bd77b4 100644 --- a/gui/gui/Module.mk +++ b/gui/gui/Module.mk @@ -61,9 +61,18 @@ GUILIB := $(LPATH)/libGui.$(SOEXT) GUIMAP := $(GUILIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GUIH)) +GUIH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GUIH)) +ALLHDRS += $(GUIH_REL) ALLLIBS += $(GUILIB) ALLMAPS += $(GUIMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GUIH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Gui_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GUILIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GUIDEP) diff --git a/gui/guibuilder/Module.mk b/gui/guibuilder/Module.mk index c193c3b092386..a0fc471379b06 100644 --- a/gui/guibuilder/Module.mk +++ b/gui/guibuilder/Module.mk @@ -28,9 +28,18 @@ GUIBLDLIB := $(LPATH)/libGuiBld.$(SOEXT) GUIBLDMAP := $(GUIBLDLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GUIBLDH)) +GUIBLDH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GUIBLDH)) +ALLHDRS += $(GUIBLDH_REL) ALLLIBS += $(GUIBLDLIB) ALLMAPS += $(GUIBLDMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GUIBLDH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Gui_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GUIBLDLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GUIBLDDEP) diff --git a/gui/guihtml/Module.mk b/gui/guihtml/Module.mk index 03ad25fd6bfc6..a97d9bfa4dd19 100644 --- a/gui/guihtml/Module.mk +++ b/gui/guihtml/Module.mk @@ -28,9 +28,18 @@ GUIHTMLLIB := $(LPATH)/libGuiHtml.$(SOEXT) GUIHTMLMAP := $(GUIHTMLLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GUIHTMLH)) +GUIHTMLH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GUIHTMLH)) +ALLHDRS += $(GUIHTMLH_REL) ALLLIBS += $(GUIHTMLLIB) ALLMAPS += $(GUIHTMLMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GUIHTMLH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Gui_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GUIHTMLLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GUIHTMLDEP) diff --git a/gui/qtgsi/Module.mk b/gui/qtgsi/Module.mk index e8dfca927941b..30ecd46f17852 100644 --- a/gui/qtgsi/Module.mk +++ b/gui/qtgsi/Module.mk @@ -55,9 +55,18 @@ endif QTTESTPATH := $(PATH):$(abspath ./bin) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(QTGSIH)) +QTGSIH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(QTGSIH)) +ALLHDRS += $(QTGSIH_REL) ALLLIBS += $(QTGSILIB) ALLMAPS += $(QTGSIMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(QTGSIH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Gui_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(QTGSILIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(QTGSIDEP) diff --git a/gui/qtroot/Module.mk b/gui/qtroot/Module.mk index 0b12079c20842..391aef3f8d5fb 100644 --- a/gui/qtroot/Module.mk +++ b/gui/qtroot/Module.mk @@ -28,9 +28,18 @@ QTROOTLIB := $(LPATH)/libQtRoot.$(SOEXT) QTROOTMAP := $(QTROOTLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(QTROOTH)) +QTROOTH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(QTROOTH)) +ALLHDRS += $(QTROOTH_REL) ALLLIBS += $(QTROOTLIB) ALLMAPS += $(QTROOTMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(QTROOTH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Gui_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(QTROOTLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(QTROOTDEP) diff --git a/gui/recorder/Module.mk b/gui/recorder/Module.mk index 37bc174018cff..32773dfacd307 100644 --- a/gui/recorder/Module.mk +++ b/gui/recorder/Module.mk @@ -28,9 +28,18 @@ RECLIB := $(LPATH)/libRecorder.$(SOEXT) RECMAP := $(RECLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RECH)) +RECH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(RECH)) +ALLHDRS += $(RECH_REL) ALLLIBS += $(RECLIB) ALLMAPS += $(RECMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(RECH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Gui_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(RECLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(RECDEP) diff --git a/gui/sessionviewer/Module.mk b/gui/sessionviewer/Module.mk index 4dd78c9d3f614..3c17d44747c6b 100644 --- a/gui/sessionviewer/Module.mk +++ b/gui/sessionviewer/Module.mk @@ -28,9 +28,18 @@ SESSIONVIEWERLIB := $(LPATH)/libSessionViewer.$(SOEXT) SESSIONVIEWERMAP := $(SESSIONVIEWERLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(SESSIONVIEWERH)) +SESSIONVIEWERH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(SESSIONVIEWERH)) +ALLHDRS += $(SESSIONVIEWERH_REL) ALLLIBS += $(SESSIONVIEWERLIB) ALLMAPS += $(SESSIONVIEWERMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SESSIONVIEWERH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Gui_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SESSIONVIEWERLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(SESSIONVIEWERDEP) diff --git a/hist/hbook/Module.mk b/hist/hbook/Module.mk index d98a2faee8830..5b5aaabcd9b48 100644 --- a/hist/hbook/Module.mk +++ b/hist/hbook/Module.mk @@ -28,9 +28,18 @@ HBOOKLIB := $(LPATH)/libHbook.$(SOEXT) HBOOKMAP := $(HBOOKLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(HBOOKH)) +HBOOKH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(HBOOKH)) +ALLHDRS += $(HBOOKH_REL) ALLLIBS += $(HBOOKLIB) ALLMAPS += $(HBOOKMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(HBOOKH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Hist_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(HBOOKLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(HBOOKDEP) diff --git a/hist/hist/Module.mk b/hist/hist/Module.mk index 995a75de3de0a..d6a59cc4d5eaf 100644 --- a/hist/hist/Module.mk +++ b/hist/hist/Module.mk @@ -21,7 +21,6 @@ HISTDH := $(HISTDS:.cxx=.h) HISTMH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) \ $(filter-out $(MODDIRI)/Math/LinkDef%,$(wildcard $(MODDIRI)/Math/*.h)) \ $(filter-out $(MODDIRI)/v5/LinkDef%,$(wildcard $(MODDIRI)/v5/*.h)) -HISTINCH := $(patsubst $(MODDIRI)/%,include/%,$(HISTMH)) #HISTHMAT += mathcore/inc/Math/WrappedFunction.h HISTS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) @@ -33,9 +32,18 @@ HISTLIB := $(LPATH)/libHist.$(SOEXT) HISTMAP := $(HISTLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(HISTINCH) +HISTMH_REL := $(patsubst $(MODDIRI)/%,include/%,$(HISTMH)) +ALLHDRS += $(HISTMH_REL) ALLLIBS += $(HISTLIB) ALLMAPS += $(HISTMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(HISTMH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Hist_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(HBOOKLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(HISTDEP) @@ -66,15 +74,15 @@ $(HISTLIB): $(HISTO) $(HISTDO) $(ORDER_) $(MAINLIBS) $(HISTLIBDEP) $(call pcmrule,HIST) $(noop) -$(HISTDS): $(HISTINCH) $(HISTL) $(ROOTCLINGEXE) $(call pcmdep,HIST) +$(HISTDS): $(HISTMH_REL) $(HISTL) $(ROOTCLINGEXE) $(call pcmdep,HIST) $(MAKEDIR) @echo "Generating dictionary $@..." - $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,HIST) -c -writeEmptyRootPCM $(patsubst include/%,%,$(HISTINCH)) $(HISTL) + $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,HIST) -c -writeEmptyRootPCM $(patsubst include/%,%,$(HISTMH_REL)) $(HISTL) -$(HISTMAP): $(HISTINCH) $(HISTL) $(ROOTCLINGEXE) $(call pcmdep,HIST) +$(HISTMAP): $(HISTMH_REL) $(HISTL) $(ROOTCLINGEXE) $(call pcmdep,HIST) $(MAKEDIR) @echo "Generating rootmap $@..." - $(ROOTCLINGSTAGE2) -r $(HISTDS) $(call dictModule,HIST) -c $(patsubst include/%,%,$(HISTINCH)) $(HISTL) + $(ROOTCLINGSTAGE2) -r $(HISTDS) $(call dictModule,HIST) -c $(patsubst include/%,%,$(HISTMH_REL)) $(HISTL) all-$(MODNAME): $(HISTLIB) diff --git a/hist/histpainter/Module.mk b/hist/histpainter/Module.mk index adbbd7e134c55..015aed6417a9c 100644 --- a/hist/histpainter/Module.mk +++ b/hist/histpainter/Module.mk @@ -29,9 +29,18 @@ HISTPAINTERLIB := $(LPATH)/libHistPainter.$(SOEXT) HISTPAINTERMAP := $(HISTPAINTERLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(HISTPAINTERH)) +HISTPAINTERH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(HISTPAINTERH)) +ALLHDRS += $(HISTPAINTERH_REL) ALLLIBS += $(HISTPAINTERLIB) ALLMAPS += $(HISTPAINTERMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(HISTPAINTERH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Hist_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(HISTPAINTERLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(HISTPAINTERDEP) diff --git a/hist/spectrum/Module.mk b/hist/spectrum/Module.mk index e7c791e6ca671..ad75afc5a5140 100644 --- a/hist/spectrum/Module.mk +++ b/hist/spectrum/Module.mk @@ -28,9 +28,18 @@ SPECTRUMLIB := $(LPATH)/libSpectrum.$(SOEXT) SPECTRUMMAP := $(SPECTRUMLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(SPECTRUMH)) +SPECTRUMH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(SPECTRUMH)) +ALLHDRS += $(SPECTRUMH_REL) ALLLIBS += $(SPECTRUMLIB) ALLMAPS += $(SPECTRUMMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SPECTRUMH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Hist_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SPECTRUMLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(SPECTRUMDEP) diff --git a/hist/spectrumpainter/Module.mk b/hist/spectrumpainter/Module.mk index 3e8dee372054c..dc31425aeb747 100644 --- a/hist/spectrumpainter/Module.mk +++ b/hist/spectrumpainter/Module.mk @@ -28,9 +28,18 @@ SPECTRUMPAINTERLIB := $(LPATH)/libSpectrumPainter.$(SOEXT) SPECTRUMPAINTERMAP := $(SPECTRUMPAINTERLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(SPECTRUMPAINTERH)) +SPECTRUMPAINTERH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(SPECTRUMPAINTERH)) +ALLHDRS += $(SPECTRUMPAINTERH_REL) ALLLIBS += $(SPECTRUMPAINTERLIB) ALLMAPS += $(SPECTRUMPAINTERMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SPECTRUMPAINTERH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Hist_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SPECTRUMPAINTERLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(SPECTRUMPAINTERDEP) diff --git a/html/Module.mk b/html/Module.mk index 99ad5c2eacec7..dab1c58e90e4f 100644 --- a/html/Module.mk +++ b/html/Module.mk @@ -19,7 +19,6 @@ HTMLDO := $(HTMLDS:.cxx=.o) HTMLDH := $(HTMLDS:.cxx=.h) HTMLH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) -HTMLINCH := $(patsubst $(MODDIRI)/%.h,include/%.h,$(HTMLH)) HTMLS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) HTMLO := $(call stripsrc,$(HTMLS:.cxx=.o)) @@ -29,9 +28,18 @@ HTMLLIB := $(LPATH)/libHtml.$(SOEXT) HTMLMAP := $(HTMLLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(HTMLINCH) +HTMLH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(HTMLH)) +ALLHDRS += $(HTMLH_REL) ALLLIBS += $(HTMLLIB) ALLMAPS += $(HTMLMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(HTMLH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Html_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(HTMLLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(HTMLDEP) @@ -50,12 +58,12 @@ $(HTMLLIB): $(HTMLO) $(HTMLDO) $(ORDER_) $(MAINLIBS) $(HTMLLIBDEP) $(call pcmrule,HTML) $(noop) -$(HTMLDS): $(HTMLINCH) $(HTMLL) $(ROOTCLINGEXE) $(call pcmdep,HTML) +$(HTMLDS): $(HTMLH_REL) $(HTMLL) $(ROOTCLINGEXE) $(call pcmdep,HTML) $(MAKEDIR) @echo "Generating dictionary $@..." $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,HTML) -c $(HTMLH) $(HTMLL) -$(HTMLMAP): $(HTMLINCH) $(HTMLL) $(ROOTCLINGEXE) $(call pcmdep,HTML) +$(HTMLMAP): $(HTMLH_REL) $(HTMLL) $(ROOTCLINGEXE) $(call pcmdep,HTML) $(MAKEDIR) @echo "Generating rootmap $@..." $(ROOTCLINGSTAGE2) -r $(HTMLDS) $(call dictModule,HTML) -c $(HTMLH) $(HTMLL) diff --git a/interpreter/cling/Module.mk b/interpreter/cling/Module.mk index 77ebff1f427cf..e2e8e69fb0f64 100644 --- a/interpreter/cling/Module.mk +++ b/interpreter/cling/Module.mk @@ -65,6 +65,13 @@ CLINGLLVMCXXFLAGS = $(filter-out -fvisibility-inlines-hidden,$(filter-out -fvisi $(filter-out -W%,\ $(patsubst -O%,,$(shell $(LLVMCONFIG) --cxxflags))))) # -ffunction-sections breaks the debugger on some platforms ... and does not help libCling at all. + +# FIXME: This is temporary until I update my compiler on mac and add -fmodules-local-submodule-visibility. +# -gmodules comes from configuring LLVM with modules. We need to filter it out too. +ifeq ($(CXXMODULES),yes) +CLINGLLVMCXXFLAGS := $(filter-out $(ROOT_CXXMODULES_CXXFLAGS) -gmodules,$(CLINGLLVMCXXFLAGS)) +endif + CLINGCXXFLAGS += -I$(CLINGDIR)/include $(filter-out -ffunction-sections,$(CLINGLLVMCXXFLAGS)) -fno-strict-aliasing ifeq ($(CTORSINITARRAY),yes) diff --git a/io/castor/Module.mk b/io/castor/Module.mk index 0e4525b9b25e3..5c05b7a91a2c5 100644 --- a/io/castor/Module.mk +++ b/io/castor/Module.mk @@ -28,9 +28,18 @@ CASTORLIB := $(LPATH)/libRCastor.$(SOEXT) CASTORMAP := $(CASTORLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(CASTORH)) +CASTORH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(CASTORH)) +ALLHDRS += $(CASTORH_REL) ALLLIBS += $(CASTORLIB) ALLMAPS += $(CASTORMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(CASTORH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(CASTORLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(CASTORDEP) diff --git a/io/chirp/Module.mk b/io/chirp/Module.mk index d5046d30bf982..8b2cc685ba62b 100644 --- a/io/chirp/Module.mk +++ b/io/chirp/Module.mk @@ -27,9 +27,18 @@ CHIRPLIB := $(LPATH)/libChirp.$(SOEXT) CHIRPMAP := $(CHIRPLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(CHIRPH)) +CHIRPH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(CHIRPH)) +ALLHDRS += $(CHIRPH_REL) ALLLIBS += $(CHIRPLIB) ALLMAPS += $(CHIRPMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(CHIRPH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(CHIRPLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(CHIRPDEP) diff --git a/io/dcache/Module.mk b/io/dcache/Module.mk index 9dcce2c611f4f..f6d01cbe0e778 100644 --- a/io/dcache/Module.mk +++ b/io/dcache/Module.mk @@ -27,9 +27,18 @@ DCACHELIB := $(LPATH)/libDCache.$(SOEXT) DCACHEMAP := $(DCACHELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(DCACHEH)) +DCACHEH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(DCACHEH)) +ALLHDRS += $(DCACHEH_REL) ALLLIBS += $(DCACHELIB) ALLMAPS += $(DCACHEMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(DCACHEH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(DCACHELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(DCACHEDEP) diff --git a/io/gfal/Module.mk b/io/gfal/Module.mk index d3b7ed0636fc9..0efb4a00738ff 100644 --- a/io/gfal/Module.mk +++ b/io/gfal/Module.mk @@ -28,9 +28,18 @@ GFALLIB := $(LPATH)/libGFAL.$(SOEXT) GFALMAP := $(GFALLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GFALH)) +GFALH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GFALH)) +ALLHDRS += $(GFALH_REL) ALLLIBS += $(GFALLIB) ALLMAPS += $(GFALMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GFALH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GFALLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GFALDEP) diff --git a/io/hdfs/Module.mk b/io/hdfs/Module.mk index 95e7c43b2ec78..6b32fc0ae4141 100644 --- a/io/hdfs/Module.mk +++ b/io/hdfs/Module.mk @@ -28,9 +28,18 @@ HDFSLIB := $(LPATH)/libHDFS.$(SOEXT) HDFSMAP := $(HDFSLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(HDFSH)) +HDFSH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(HDFSH)) +ALLHDRS += $(HDFSH_REL) ALLLIBS += $(HDFSLIB) ALLMAPS += $(HDFSMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(HDFSH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(HDFSLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(HDFSDEP) diff --git a/io/io/Module.mk b/io/io/Module.mk index 5f4fce6ee8de6..a6763a6557ec7 100644 --- a/io/io/Module.mk +++ b/io/io/Module.mk @@ -28,9 +28,18 @@ IOLIB := $(LPATH)/libRIO.$(SOEXT) IOMAP := $(IOLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(IOH)) +IOH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(IOH)) +ALLHDRS += $(IOH_REL) ALLLIBS += $(IOLIB) ALLMAPS += $(IOMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(IOH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(IOLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(IODEP) diff --git a/io/rfio/Module.mk b/io/rfio/Module.mk index 66a289a54df15..ca1da8ea814ce 100644 --- a/io/rfio/Module.mk +++ b/io/rfio/Module.mk @@ -28,9 +28,18 @@ RFIOLIB := $(LPATH)/libRFIO.$(SOEXT) RFIOMAP := $(RFIOLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RFIOH)) +RFIOH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(RFIOH)) +ALLHDRS += $(RFIOH_REL) ALLLIBS += $(RFIOLIB) ALLMAPS += $(RFIOMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(RFIOH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(RFIOLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(RFIODEP) diff --git a/io/sql/Module.mk b/io/sql/Module.mk index 2e0c9ab45c8c8..1a2ab7dd5b08a 100644 --- a/io/sql/Module.mk +++ b/io/sql/Module.mk @@ -28,9 +28,18 @@ SQLLIB := $(LPATH)/libSQLIO.$(SOEXT) SQLMAP := $(SQLLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(SQLH)) +SQLH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(SQLH)) +ALLHDRS += $(SQLH_REL) ALLLIBS += $(SQLLIB) ALLMAPS += $(SQLMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SQLH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SQLLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(SQLDEP) diff --git a/io/xml/Module.mk b/io/xml/Module.mk index a019dd695f037..c138a96bfbfd6 100644 --- a/io/xml/Module.mk +++ b/io/xml/Module.mk @@ -28,9 +28,18 @@ XMLLIB := $(LPATH)/libXMLIO.$(SOEXT) XMLMAP := $(XMLLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(XMLH)) +XMLH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(XMLH)) +ALLHDRS += $(XMLH_REL) ALLLIBS += $(XMLLIB) ALLMAPS += $(XMLMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(XMLH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(XMLLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(XMLDEP) diff --git a/io/xmlparser/Module.mk b/io/xmlparser/Module.mk index 588eb4080da1d..3009ba5f73c99 100644 --- a/io/xmlparser/Module.mk +++ b/io/xmlparser/Module.mk @@ -28,9 +28,18 @@ XMLPARSERLIB := $(LPATH)/libXMLParser.$(SOEXT) XMLPARSERMAP := $(XMLPARSERLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(XMLPARSERH)) +XMLPARSERH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(XMLPARSERH)) +ALLHDRS += $(XMLPARSERH_REL) ALLLIBS += $(XMLPARSERLIB) ALLMAPS += $(XMLPARSERMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(XMLPARSERH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Io_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(XMLPARSERLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(XMLPARSERDEP) diff --git a/math/fftw/Module.mk b/math/fftw/Module.mk index 91e2120c298f9..f63fb35b8de21 100644 --- a/math/fftw/Module.mk +++ b/math/fftw/Module.mk @@ -28,9 +28,18 @@ FFTWLIB := $(LPATH)/libFFTW.$(SOEXT) FFTWMAP := $(FFTWLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(FFTWH)) +FFTWH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(FFTWH)) +ALLHDRS += $(FFTWH_REL) ALLLIBS += $(FFTWLIB) ALLMAPS += $(FFTWMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(FFTWH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_FFTW { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(FFTWLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(FFTWDEP) diff --git a/math/foam/Module.mk b/math/foam/Module.mk index 92e6d1b988748..55fc1c3296957 100644 --- a/math/foam/Module.mk +++ b/math/foam/Module.mk @@ -28,9 +28,18 @@ FOAMLIB := $(LPATH)/libFoam.$(SOEXT) FOAMMAP := $(FOAMLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(FOAMH)) +FOAMH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(FOAMH)) +ALLHDRS += $(FOAMH_REL) ALLLIBS += $(FOAMLIB) ALLMAPS += $(FOAMMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(FOAMH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_Foam { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(FOAMLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(FOAMDEP) diff --git a/math/fumili/Module.mk b/math/fumili/Module.mk index b60e2ebdbfd54..fb4906f215706 100644 --- a/math/fumili/Module.mk +++ b/math/fumili/Module.mk @@ -28,9 +28,18 @@ FUMILILIB := $(LPATH)/libFumili.$(SOEXT) FUMILIMAP := $(FUMILILIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(FUMILIH)) +FUMILIH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(FUMILIH)) +ALLHDRS += $(FUMILIH_REL) ALLLIBS += $(FUMILILIB) ALLMAPS += $(FUMILIMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(FUMILIH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_Fumili { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(FUMILILIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(FUMILIDEP) diff --git a/math/genetic/Module.mk b/math/genetic/Module.mk index 79da1e3b37518..540f5debfeae8 100644 --- a/math/genetic/Module.mk +++ b/math/genetic/Module.mk @@ -31,9 +31,18 @@ GENETICLIB := $(LPATH)/libGenetic.$(SOEXT) GENETICMAP := $(GENETICLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(GENETICH)) +GENETICH_REL := $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(GENETICH)) +ALLHDRS += $(GENETICH_REL) ALLLIBS += $(GENETICLIB) ALLMAPS += $(GENETICMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GENETICH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_Genetic { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GENETICLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GENETICDEP) diff --git a/math/genvector/Module.mk b/math/genvector/Module.mk index 8992a518ffcef..8151a1393a231 100644 --- a/math/genvector/Module.mk +++ b/math/genvector/Module.mk @@ -71,9 +71,18 @@ GENVECTORMAP := $(GENVECTORLIB:.$(SOEXT)=.rootmap) GENVECTORMAP32:= $(GENVECTORLIB:.$(SOEXT)=32.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(GENVECTORH)) +GENVECTORH_REL := $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(GENVECTORH)) +ALLHDRS += $(GENVECTORH_REL) ALLLIBS += $(GENVECTORLIB) ALLMAPS += $(GENVECTORMAP) $(GENVECTORMAP32) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GENVECTORH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_GenVector { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GENVECTORLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GENVECTORDEP) diff --git a/math/mathcore/Module.mk b/math/mathcore/Module.mk index 5eca01882d330..a3cd58a0f46d2 100644 --- a/math/mathcore/Module.mk +++ b/math/mathcore/Module.mk @@ -88,9 +88,18 @@ MATHCORELIB := $(LPATH)/libMathCore.$(SOEXT) MATHCOREMAP := $(MATHCORELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%,include/%,$(MATHCOREMH)) +MATHCOREMH_REL := $(patsubst $(MODDIRI)/%,include/%,$(MATHCOREMH)) +ALLHDRS += $(MATHCOREMH_REL) ALLLIBS += $(MATHCORELIB) ALLMAPS += $(MATHCOREMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MATHCOREMH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_Core { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(MATHCORELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(MATHCOREDEP) diff --git a/math/mathmore/Module.mk b/math/mathmore/Module.mk index a2df1b6c77028..c20b0662a21bd 100644 --- a/math/mathmore/Module.mk +++ b/math/mathmore/Module.mk @@ -69,9 +69,18 @@ MATHMORELIB := $(LPATH)/libMathMore.$(SOEXT) MATHMOREMAP := $(MATHMORELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(MATHMOREH)) +MATHMOREH_REL := $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(MATHMOREH)) +ALLHDRS += $(MATHMOREH_REL) ALLLIBS += $(MATHMORELIB) ALLMAPS += $(MATHMOREMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MATHMOREH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_More { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(MATHMORELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(MATHMOREDEP) diff --git a/math/matrix/Module.mk b/math/matrix/Module.mk index 59a66d42e35d5..f7d3e217ae70d 100644 --- a/math/matrix/Module.mk +++ b/math/matrix/Module.mk @@ -28,9 +28,18 @@ MATRIXLIB := $(LPATH)/libMatrix.$(SOEXT) MATRIXMAP := $(MATRIXLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(MATRIXH)) +MATRIXH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(MATRIXH)) +ALLHDRS += $(MATRIXH_REL) ALLLIBS += $(MATRIXLIB) ALLMAPS += $(MATRIXMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MATRIXH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_Matrix { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(MATRIXLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(MATRIXDEP) diff --git a/math/minuit/Module.mk b/math/minuit/Module.mk index add3d2644cb0d..5fa3575c717d8 100644 --- a/math/minuit/Module.mk +++ b/math/minuit/Module.mk @@ -28,9 +28,18 @@ MINUITLIB := $(LPATH)/libMinuit.$(SOEXT) MINUITMAP := $(MINUITLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(MINUITH)) +MINUITH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(MINUITH)) +ALLHDRS += $(MINUITH_REL) ALLLIBS += $(MINUITLIB) ALLMAPS += $(MINUITMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MINUITH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(MINUITLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(MINUITDEP) diff --git a/math/minuit2/Module.mk b/math/minuit2/Module.mk index 1942891b7a03f..02be619d87cfc 100644 --- a/math/minuit2/Module.mk +++ b/math/minuit2/Module.mk @@ -43,7 +43,6 @@ MINUIT2DH := $(MINUIT2DS:.cxx=.h) MINUIT2AH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) MINUIT2BH := $(filter-out $(MODDIRI)/Minuit2/LinkDef%,$(wildcard $(MODDIRI)/Minuit2/*.h)) MINUIT2H := $(MINUIT2AH) $(MINUIT2BH) -MINUIT2INCH := $(patsubst $(MODDIRI)/%.h,include/%.h,$(MINUIT2H)) MINUIT2S := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) MINUIT2O := $(call stripsrc,$(MINUIT2S:.cxx=.o)) @@ -58,9 +57,18 @@ MINUIT2MAP := $(MINUIT2LIB:.$(SOEXT)=.rootmap) #CXXFLAGS += -DMN_USE_STACK_ALLOC # used in the main Makefile -ALLHDRS += $(MINUIT2INCH) +MINUIT2H_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(MINUIT2H)) +ALLHDRS += $(MINUIT2H_REL) ALLLIBS += $(MINUIT2LIB) ALLMAPS += $(MINUIT2MAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MINUIT2H_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(MINUIT2LIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(MINUIT2DEP) @@ -87,16 +95,16 @@ $(MINUIT2LIB): $(MINUIT2O) $(MINUIT2DO) $(ORDER_) $(MAINLIBS) $(MINUIT2LIBDEP) $(call pcmrule,MINUIT2) $(noop) -$(MINUIT2DS): $(MINUIT2INCH) $(MINUIT2L) $(ROOTCLINGEXE) $(call pcmdep,MINUIT2) +$(MINUIT2DS): $(MINUIT2H_REL) $(MINUIT2L) $(ROOTCLINGEXE) $(call pcmdep,MINUIT2) $(MAKEDIR) @echo "Generating dictionary $@..." - @echo subst = $(patsubst include/%,%,$(MINUIT2INCH)) - $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,MINUIT2) -c -writeEmptyRootPCM $(patsubst include/%,%,$(MINUIT2INCH)) $(MINUIT2L) + @echo subst = $(patsubst include/%,%,$(MINUIT2H_REL)) + $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,MINUIT2) -c -writeEmptyRootPCM $(patsubst include/%,%,$(MINUIT2H_REL)) $(MINUIT2L) -$(MINUIT2MAP): $(MINUIT2INCH) $(MINUIT2L) $(ROOTCLINGEXE) $(call pcmdep,MINUIT2) +$(MINUIT2MAP): $(MINUIT2H_REL) $(MINUIT2L) $(ROOTCLINGEXE) $(call pcmdep,MINUIT2) $(MAKEDIR) @echo "Generating rootmap $@..." - $(ROOTCLINGSTAGE2) -r $(MINUIT2DS) $(call dictModule,MINUIT2) -c $(patsubst include/%,%,$(MINUIT2INCH)) $(MINUIT2L) + $(ROOTCLINGSTAGE2) -r $(MINUIT2DS) $(call dictModule,MINUIT2) -c $(patsubst include/%,%,$(MINUIT2H_REL)) $(MINUIT2L) all-$(MODNAME): $(MINUIT2LIB) diff --git a/math/mlp/Module.mk b/math/mlp/Module.mk index 8d52ede0f5897..c546bba9f10d1 100644 --- a/math/mlp/Module.mk +++ b/math/mlp/Module.mk @@ -28,9 +28,18 @@ MLPLIB := $(LPATH)/libMLP.$(SOEXT) MLPMAP := $(MLPLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(MLPH)) +MLPH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(MLPH)) +ALLHDRS += $(MLPH_REL) ALLLIBS += $(MLPLIB) ALLMAPS += $(MLPMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MLPH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(MLPLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(MLPDEP) diff --git a/math/physics/Module.mk b/math/physics/Module.mk index 7280cb3cf955e..24c6aa3f89640 100644 --- a/math/physics/Module.mk +++ b/math/physics/Module.mk @@ -28,9 +28,18 @@ PHYSICSLIB := $(LPATH)/libPhysics.$(SOEXT) PHYSICSMAP := $(PHYSICSLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PHYSICSH)) +PHYSICSH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PHYSICSH)) +ALLHDRS += $(PHYSICSH_REL) ALLLIBS += $(PHYSICSLIB) ALLMAPS += $(PHYSICSMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PHYSICSH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PHYSICSLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PHYSICSDEP) diff --git a/math/quadp/Module.mk b/math/quadp/Module.mk index 1b8e61ed78b74..c8422d42a58b3 100644 --- a/math/quadp/Module.mk +++ b/math/quadp/Module.mk @@ -28,9 +28,18 @@ QUADPLIB := $(LPATH)/libQuadp.$(SOEXT) QUADPMAP := $(QUADPLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(QUADPH)) +QUADPH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(QUADPH)) +ALLHDRS += $(QUADPH_REL) ALLLIBS += $(QUADPLIB) ALLMAPS += $(QUADPMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(QUADPH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(QUADPLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(QUADPDEP) diff --git a/math/rtools/Module.mk b/math/rtools/Module.mk index f3572de9e6162..56be8a09471bb 100644 --- a/math/rtools/Module.mk +++ b/math/rtools/Module.mk @@ -31,9 +31,18 @@ RTOOLSLIB := $(LPATH)/libRtools.$(SOEXT) RTOOLSMAP := $(RTOOLSLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(RTOOLSH)) +RTOOLSH_REL := $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(RTOOLSH)) +ALLHDRS += $(RTOOLSH_REL) ALLLIBS += $(RTOOLSLIB) ALLMAPS += $(RTOOLSMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(RTOOLSH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(RTOOLSLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(RTOOLSDEP) diff --git a/math/smatrix/Module.mk b/math/smatrix/Module.mk index 640845e45152e..fd2e344208764 100644 --- a/math/smatrix/Module.mk +++ b/math/smatrix/Module.mk @@ -45,10 +45,18 @@ SMATRIXMAP := $(SMATRIXLIB:.$(SOEXT)=.rootmap) SMATRIXMAP32:= $(SMATRIXLIB:.$(SOEXT)=32.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(SMATRIXH1)) -ALLHDRS += $(patsubst $(MODDIRI)/Math/%.icc,include/Math/%.icc,$(SMATRIXH2)) +SMATRIXH_REL := $(patsubst $(MODDIRI)/Math/%,include/Math/%,$(SMATRIXH)) +ALLHDRS += $(SMATRIXH_REL) ALLLIBS += $(SMATRIXLIB) ALLMAPS += $(SMATRIXMAP) $(SMATRIXMAP32) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SMATRIXH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SMATRIXLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(SMATRIXDEP) diff --git a/math/splot/Module.mk b/math/splot/Module.mk index c33bf08138bb9..62e19e013c988 100644 --- a/math/splot/Module.mk +++ b/math/splot/Module.mk @@ -28,9 +28,18 @@ SPLOTLIB := $(LPATH)/libSPlot.$(SOEXT) SPLOTMAP := $(SPLOTLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(SPLOTH)) +SPLOTH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(SPLOTH)) +ALLHDRS += $(SPLOTH_REL) ALLLIBS += $(SPLOTLIB) ALLMAPS += $(SPLOTMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SPLOTH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SPLOTLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(SPLOTDEP) diff --git a/math/unuran/Module.mk b/math/unuran/Module.mk index 5730dbbdc079f..037318c4d095b 100644 --- a/math/unuran/Module.mk +++ b/math/unuran/Module.mk @@ -76,9 +76,18 @@ UNURANLIB := $(LPATH)/libUnuran.$(SOEXT) UNURANMAP := $(UNURANLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(UNURANH)) +UNURANH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(UNURANH)) +ALLHDRS += $(UNURANH_REL) ALLLIBS += $(UNURANLIB) ALLMAPS += $(UNURANMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(UNURANH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(UNURANLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(UNURANDEP) diff --git a/math/vdt/Module.mk b/math/vdt/Module.mk new file mode 100644 index 0000000000000..a89a3fc0bfd1d --- /dev/null +++ b/math/vdt/Module.mk @@ -0,0 +1,58 @@ +# Module.mk for VDT +# +# Author: Danilo Piparo + +MODNAME := vdt +MODDIR := $(ROOT_SRCDIR)/math/$(MODNAME) +MODDIRI := $(MODDIR)/include +MODDIRS := $(MODDIR)/include + +VDTH := include/vdt/asin.h\ + include/vdt/atan2.h\ + include/vdt/atan.h\ + include/vdt/cos.h\ + include/vdt/exp.h\ + include/vdt/inv.h\ + include/vdt/log.h\ + include/vdt/sincos.h\ + include/vdt/sin.h\ + include/vdt/sqrt.h\ + include/vdt/tan.h\ + include/vdt/vdtcore_common.h\ + include/vdt/vdtMath.h + +# We create a stamp file as vdt is the only module without a library. +VDTH_REL := $(patsubst $(MODDIRI)/vdt/%.h, include/%.h, $(VDTH)) +ALLHDRS += $(VDTH_REL) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(VDTH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += // link no-library-created \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif + + +##### local rules ##### +.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) \ + test-$(MODNAME) + +include/vdt/%.h: $(MODDIRI)/vdt/%.h + @(if [ ! -d "include/vdt" ]; then \ + mkdir -p include/vdt; \ + fi) + cp $< $@ + +all-$(MODNAME): + $(noop) + +clean-$(MODNAME): + $(noop) + +clean:: clean-$(MODNAME) + +distclean-$(MODNAME): clean-$(MODNAME) + @rm -rf include/vdt + +distclean:: distclean-$(MODNAME) diff --git a/misc/memstat/Module.mk b/misc/memstat/Module.mk index 962bbe00ab6cf..ed482d87bb18e 100644 --- a/misc/memstat/Module.mk +++ b/misc/memstat/Module.mk @@ -34,10 +34,19 @@ MEMSTATLIB := $(LPATH)/libMemStat.$(SOEXT) MEMSTATMAP := $(MEMSTATLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(MEMSTATH)) +MEMSTATH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(MEMSTATH)) +ALLHDRS += $(MEMSTATH_REL) ALLLIBS += $(MEMSTATLIB) ALLMAPS += $(MEMSTATMAP) - +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MEMSTATH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Misc_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(MEMSTATLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif + # include all dependency files INCLUDEFILES += $(MEMSTATDEP) diff --git a/misc/table/Module.mk b/misc/table/Module.mk index 441c414c7527b..30890ddcc2311 100644 --- a/misc/table/Module.mk +++ b/misc/table/Module.mk @@ -28,9 +28,18 @@ TABLELIB := $(LPATH)/libTable.$(SOEXT) TABLEMAP := $(TABLELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(TABLEH)) +TABLEH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(TABLEH)) +ALLHDRS += $(TABLEH_REL) ALLLIBS += $(TABLELIB) ALLMAPS += $(TABLEMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TABLEH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Misc_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(TABLELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(TABLEDEP) diff --git a/montecarlo/eg/Module.mk b/montecarlo/eg/Module.mk index 2445089d10582..b4efdc4164b00 100644 --- a/montecarlo/eg/Module.mk +++ b/montecarlo/eg/Module.mk @@ -29,9 +29,18 @@ EGLIB := $(LPATH)/libEG.$(SOEXT) EGMAP := $(EGLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(EGH)) +EGH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(EGH)) +ALLHDRS += $(EGH_REL) ALLLIBS += $(EGLIB) ALLMAPS += $(EGMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(EGH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Montecarlo_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(EGLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(EGDEP) diff --git a/montecarlo/pythia6/Module.mk b/montecarlo/pythia6/Module.mk index 66836313487ca..b667918d7b6d7 100644 --- a/montecarlo/pythia6/Module.mk +++ b/montecarlo/pythia6/Module.mk @@ -42,9 +42,18 @@ endif endif # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYTHIA6H)) +PYTHIA6H_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYTHIA6H)) +ALLHDRS += $(PYTHIA6H_REL) ALLLIBS += $(PYTHIA6LIB) ALLMAPS += $(PYTHIA6MAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PYTHIA6H_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Montecarlo_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PYTHIA6LIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PYTHIA6DEP) diff --git a/montecarlo/pythia8/Module.mk b/montecarlo/pythia8/Module.mk index 7a5ef515aa33f..1637043025b47 100644 --- a/montecarlo/pythia8/Module.mk +++ b/montecarlo/pythia8/Module.mk @@ -28,9 +28,18 @@ PYTHIA8LIB := $(LPATH)/libEGPythia8.$(SOEXT) PYTHIA8MAP := $(PYTHIA8LIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYTHIA8H)) +PYTHIA8H_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYTHIA8H)) +ALLHDRS += $(PYTHIA8H_REL) ALLLIBS += $(PYTHIA8LIB) ALLMAPS += $(PYTHIA8MAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PYTHIA8H_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Montecarlo_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PYTHIA8LIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PYTHIA8DEP) diff --git a/montecarlo/vmc/Module.mk b/montecarlo/vmc/Module.mk index 449e80a117fc4..edd3335a9c659 100644 --- a/montecarlo/vmc/Module.mk +++ b/montecarlo/vmc/Module.mk @@ -29,9 +29,18 @@ VMCLIB := $(LPATH)/libVMC.$(SOEXT) VMCMAP := $(VMCLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(VMCH)) +VMCH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(VMCH)) +ALLHDRS += $(VMCH_REL) ALLLIBS += $(VMCLIB) ALLMAPS += $(VMCMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(VMCH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Montecarlo_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(VMCLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(VMCDEP) diff --git a/net/alien/Module.mk b/net/alien/Module.mk index 7d835c908c506..c1c83df78ae30 100644 --- a/net/alien/Module.mk +++ b/net/alien/Module.mk @@ -36,9 +36,18 @@ endif ifeq ($(HASXRD),yes) ifeq ($(BUILDALIEN),yes) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ALIENH)) +ALIENH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(ALIENH)) +ALLHDRS += $(ALIENH_REL) ALLLIBS += $(ALIENLIB) ALLMAPS += $(ALIENMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(ALIENH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(ALIENLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(ALIENDEP) diff --git a/net/auth/Module.mk b/net/auth/Module.mk index dc6e7de0fb6aa..3482c3e6da43f 100644 --- a/net/auth/Module.mk +++ b/net/auth/Module.mk @@ -82,14 +82,27 @@ EXTRA_RAUTHLIBS += -lz endif # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RAUTHH)) +RAUTHH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(RAUTHH)) +ALLHDRS += $(RAUTHH_REL) ALLLIBS += $(RAUTHLIB) ALLMAPS += $(RAUTHMAP) ifneq ($(AFSLIB),) -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(AFSAUTHH)) +AFSAUTHH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(AFSAUTHH)) +ALLHDRS += $(AFSAUTHH_REL) ALLLIBS += $(AFSAUTHLIB) ALLMAPS += $(AFSAUTHMAP) endif +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(RAUTHH_REL) $(AFSAUTHH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(RAUTHLIB)\" \\n +ifneq ($(AFSLIB),) + CXXMODULES_MODULEMAP_CONTENTS += link \"$(AFSAUTHLIB)\" \\n +endif + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(RAUTHDEP) diff --git a/net/bonjour/Module.mk b/net/bonjour/Module.mk index 0cc46c89048cc..e7740d32ec2e7 100644 --- a/net/bonjour/Module.mk +++ b/net/bonjour/Module.mk @@ -28,9 +28,18 @@ BONJLIB := $(LPATH)/libBonjour.$(SOEXT) BONJMAP := $(BONJLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(BONJH)) +BONJH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(BONJH)) +ALLHDRS += $(BONJH_REL) ALLLIBS += $(BONJLIB) ALLMAPS += $(BONJMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(BONJH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(BONJLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(BONJDEP) diff --git a/net/davix/Module.mk b/net/davix/Module.mk index c217d0868550c..0be322e67dc51 100644 --- a/net/davix/Module.mk +++ b/net/davix/Module.mk @@ -27,9 +27,18 @@ DAVIXLIB := $(LPATH)/libRDAVIX.$(SOEXT) DAVIXMAP := $(DAVIXLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(DAVIXH)) +DAVIXH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(DAVIXH)) +ALLHDRS += $(DAVIXH_REL) ALLLIBS += $(DAVIXLIB) ALLMAPS += $(DAVIXMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(DAVIXH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(DAVIXLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(DAVIXDEP) diff --git a/net/glite/Module.mk b/net/glite/Module.mk index c1006717ace35..0165fa5819866 100644 --- a/net/glite/Module.mk +++ b/net/glite/Module.mk @@ -28,9 +28,18 @@ GLITELIB := $(LPATH)/libRgLite.$(SOEXT) GLITEMAP := $(GLITELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GLITEH)) +GLITEH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GLITEH)) +ALLHDRS += $(GLITEH_REL) ALLLIBS += $(GLITELIB) ALLMAPS += $(GLITEMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GLITEH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GLITELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GLITEDEP) diff --git a/net/globusauth/Module.mk b/net/globusauth/Module.mk index f1ab0b4ac3071..e0423f5dd4a9c 100644 --- a/net/globusauth/Module.mk +++ b/net/globusauth/Module.mk @@ -33,8 +33,17 @@ GLBPATCHDEP := $(GLBPATCHO:.o=.d) endif # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GLBSAUTHH)) +GLBSAUTHH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(GLBSAUTHH)) +ALLHDRS += $(GLBSAUTHH_REL) ALLLIBS += $(GLBSAUTHLIB) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(GLBSAUTHH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(GLBSAUTHLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(GLBSAUTHDEP) diff --git a/net/http/Module.mk b/net/http/Module.mk index 20d0054057339..190e1fd9901ca 100644 --- a/net/http/Module.mk +++ b/net/http/Module.mk @@ -37,9 +37,18 @@ HTTPMAP := $(HTTPLIB:.$(SOEXT)=.rootmap) HTTPCXXFLAGS := $(HTTPINCDIR:%=-I%) $(FASTCGIINCDIR:%=-I%) $(FASTCGIFLAGS) -DUSE_WEBSOCKET # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(HTTPH)) +HTTPH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(HTTPH)) +ALLHDRS += $(HTTPH_REL) ALLLIBS += $(HTTPLIB) ALLMAPS += $(HTTPMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(HTTPH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(HTTPLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(HTTPDEP) diff --git a/net/krb5auth/Module.mk b/net/krb5auth/Module.mk index fa4a425effca0..76a5b6d198ae3 100644 --- a/net/krb5auth/Module.mk +++ b/net/krb5auth/Module.mk @@ -30,9 +30,18 @@ KRB5AUTHLIB := $(LPATH)/libKrb5Auth.$(SOEXT) KRB5AUTHMAP := $(KRB5AUTHLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(KRB5AUTHH)) +KRB5AUTHH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(KRB5AUTHH)) +ALLHDRS += $(KRB5AUTHH_REL) ALLLIBS += $(KRB5AUTHLIB) ALLMAPS += $(KRB5AUTHMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(KRB5AUTHH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(KRB5AUTHLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(KRB5AUTHDEP) diff --git a/net/ldap/Module.mk b/net/ldap/Module.mk index b2254220b2644..34b9cd3d0eb56 100644 --- a/net/ldap/Module.mk +++ b/net/ldap/Module.mk @@ -28,9 +28,18 @@ LDAPLIB := $(LPATH)/libRLDAP.$(SOEXT) LDAPMAP := $(LDAPLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(LDAPH)) +LDAPH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(LDAPH)) +ALLHDRS += $(LDAPH_REL) ALLLIBS += $(LDAPLIB) ALLMAPS += $(LDAPMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(LDAPH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(LDAPLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(LDAPDEP) diff --git a/net/monalisa/Module.mk b/net/monalisa/Module.mk index 9c5e10b84d81a..2f663db275dd6 100644 --- a/net/monalisa/Module.mk +++ b/net/monalisa/Module.mk @@ -28,9 +28,18 @@ MONALISALIB := $(LPATH)/libMonaLisa.$(SOEXT) MONALISAMAP := $(MONALISALIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(MONALISAH)) +MONALISAH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(MONALISAH)) +ALLHDRS += $(MONALISAH_REL) ALLLIBS += $(MONALISALIB) ALLMAPS += $(MONALISAMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MONALISAH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(MONALISALIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(MONALISADEP) diff --git a/net/net/Module.mk b/net/net/Module.mk index 3d98084baac48..fed30a027500b 100644 --- a/net/net/Module.mk +++ b/net/net/Module.mk @@ -52,9 +52,18 @@ EXTRANETFLAGS = NETINCH := $(subst $(MODDIRI)/%.h,include/%.h,$(NETMH)) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(NETMH)) +NETMH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(NETMH)) +ALLHDRS += $(NETMH_REL) ALLLIBS += $(NETLIB) ALLMAPS += $(NETMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(NETMH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(NETLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(NETDEP) diff --git a/net/netx/Module.mk b/net/netx/Module.mk index ec80517e51fc5..b0acfefd22cb0 100644 --- a/net/netx/Module.mk +++ b/net/netx/Module.mk @@ -29,9 +29,18 @@ NETXMAP := $(NETXLIB:.$(SOEXT)=.rootmap) ifeq ($(HASXRD),yes) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(NETXH)) +NETXH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(NETXH)) +ALLHDRS += $(NETXH_REL) ALLLIBS += $(NETXLIB) ALLMAPS += $(NETXMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(NETXH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(NETXLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(NETXDEP) diff --git a/net/netxng/Module.mk b/net/netxng/Module.mk index 6799b6c8f3b77..d8d24e56e97ae 100644 --- a/net/netxng/Module.mk +++ b/net/netxng/Module.mk @@ -28,9 +28,18 @@ NETXNGLIB := $(LPATH)/libNetxNG.$(SOEXT) NETXNGMAP := $(NETXNGLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(NETXNGH)) +NETXNGH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(NETXNGH)) +ALLHDRS += $(NETXNGH_REL) ALLLIBS += $(NETXNGLIB) ALLMAPS += $(NETXNGMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(NETXNGH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(NETXNGLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(NETXNGDEP) diff --git a/net/rootd/Module.mk b/net/rootd/Module.mk index 3f25274a289ac..f891c93a2cbe2 100644 --- a/net/rootd/Module.mk +++ b/net/rootd/Module.mk @@ -24,8 +24,17 @@ ROOTDDEP := $(ROOTDO:.o=.d) ROOTD := bin/rootd # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ROOTDH)) +ROOTDH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(ROOTDH)) +ALLHDRS += $(ROOTDH_REL) ALLEXECS += $(ROOTD) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(ROOTDH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += // link no-library-created \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(ROOTDDEP) diff --git a/net/rpdutils/Module.mk b/net/rpdutils/Module.mk index 957c311d558ac..d746a2f0d0f70 100644 --- a/net/rpdutils/Module.mk +++ b/net/rpdutils/Module.mk @@ -85,7 +85,17 @@ AUTHLIBS += -lz endif # used in the main Makefile +RPDH_REL += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RPDUTILH) $(RPDCONNH) $(RPDPRIVH)) +ALLHDRS += $(RPDH_REL) ALLLIBS += $(SRVAUTHLIB) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(RPDH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SRVAUTHLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(RPDUTILDEP) $(RPDCONNDEP) $(RPDPRIVDEP) diff --git a/net/srputils/Module.mk b/net/srputils/Module.mk index 64002b706f127..abb0e59158a97 100644 --- a/net/srputils/Module.mk +++ b/net/srputils/Module.mk @@ -34,9 +34,18 @@ RTCONFDEP := $(RTCONFO:.o=.d) RTCONF := bin/rtconf # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(SRPUTILSH)) +SRPUTILSH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(SRPUTILSH)) +ALLHDRS += $(SRPUTILSH_REL) ALLLIBS += $(SRPUTILSLIB) ALLEXECS += $(RPASSWD) $(RTCONF) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SRPUTILSH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Net_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SRPUTILSLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(SRPUTILSDEP) $(RPASSWDDEP) $(RTCONFDEP) diff --git a/proof/pq2/Module.mk b/proof/pq2/Module.mk index 8c84cf27cea6f..994fae6d37eb8 100644 --- a/proof/pq2/Module.mk +++ b/proof/pq2/Module.mk @@ -26,8 +26,17 @@ PQ2LIBSDEP = $(BOOTLIBSDEP) $(IOLIB) $(NETLIB) $(HISTLIB) $(TREELIB) \ $(MATRIXLIB) $(MATHCORELIB) $(PROOFLIB) $(THREADLIB) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PQ2H)) +PQ2H_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PQ2H)) +ALLHDRS += $(PQ2H_REL) ALLEXECS += $(PQ2) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PQ2H_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Proof_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += // link no-library-created \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PQ2DEP) diff --git a/proof/proof/Module.mk b/proof/proof/Module.mk index 6fbf91a5605da..775f7dc8d79d3 100644 --- a/proof/proof/Module.mk +++ b/proof/proof/Module.mk @@ -38,9 +38,18 @@ PROOFLIB := $(LPATH)/libProof.$(SOEXT) PROOFMAP := $(PROOFLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFH)) +PROOFH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFH)) +ALLHDRS += $(PROOFH_REL) ALLLIBS += $(PROOFLIB) ALLMAPS += $(PROOFMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PROOFH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Proof_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PROOFLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PROOFDEP) diff --git a/proof/proofbench/Module.mk b/proof/proofbench/Module.mk index f307d0698ed28..609dd6d807cb0 100644 --- a/proof/proofbench/Module.mk +++ b/proof/proofbench/Module.mk @@ -51,9 +51,20 @@ PBCPARS := $(MODDIRS)/TSelHist.cxx PBCPAR := $(PBPARDIR)/ProofBenchCPUSel.par # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFBENCHH)) +PROOFBENCHH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFBENCHH)) +ALLHDRS += $(PROOFBENCHH_REL) ALLLIBS += $(PROOFBENCHLIB) $(PBDPAR) $(PBCPAR) ALLMAPS += $(PROOFBENCHMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PROOFBENCHH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Proof_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PROOFBENCHLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PBDPAR)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PBCPAR)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PROOFBENCHDEP) diff --git a/proof/proofd/Module.mk b/proof/proofd/Module.mk index a9d7b29001691..861938d7993a7 100644 --- a/proof/proofd/Module.mk +++ b/proof/proofd/Module.mk @@ -56,7 +56,18 @@ XPDINCEXTRA += $(PROOFDDIRI:%=-I%) XPDLIBEXTRA := $(XROOTDDIRL)/libXrdClient.lib # used in the main Makefile +PROOFDEXEH := $(MODDIRI)/proofdp.h +PROOFDEXEH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFDEXEH)) +ALLHDRS += $(PROOFDEXEH_REL) ALLLIBS += $(XPDLIB) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PROOFDEXEH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Proof_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(XPDLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(XPDDEP) diff --git a/proof/proofplayer/Module.mk b/proof/proofplayer/Module.mk index e75121a9da7e5..87cd0f14623f3 100644 --- a/proof/proofplayer/Module.mk +++ b/proof/proofplayer/Module.mk @@ -45,10 +45,19 @@ PROOFDRAWLIB := $(LPATH)/libProofDraw.$(SOEXT) PROOFDRAWMAP := $(PROOFDRAWLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFPLAYERH)) -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFDRAWH)) +PROOFPLAYERH_PROOFDRAWH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFPLAYERH) $(PROOFDRAWH)) +ALLHDRS += $(PROOFPLAYERH_PROOFDRAWH_REL) ALLLIBS += $(PROOFPLAYERLIB) $(PROOFDRAWLIB) ALLMAPS += $(PROOFPLAYERMAP) $(PROOFDRAWMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PROOFPLAYERH_PROOFDRAWH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Proof_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PROOFPLAYERLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PROOFDRAWLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PROOFPLAYERDEP) $(PROOFDRAWDEP) diff --git a/proof/proofx/Module.mk b/proof/proofx/Module.mk index d3a7210c9537e..b92c6255c3590 100644 --- a/proof/proofx/Module.mk +++ b/proof/proofx/Module.mk @@ -38,9 +38,18 @@ PROOFXMAP := $(PROOFXLIB:.$(SOEXT)=.rootmap) ifeq ($(HASXRD),yes) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFXH)) +PROOFXH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PROOFXH)) +ALLHDRS += $(PROOFXH_REL) ALLLIBS += $(PROOFXLIB) ALLMAPS += $(PROOFXMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PROOFXH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Proof_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PROOFXLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PROOFXDEP) diff --git a/roofit/histfactory/Module.mk b/roofit/histfactory/Module.mk index 59ed287e1ef13..c7808ebe2802b 100644 --- a/roofit/histfactory/Module.mk +++ b/roofit/histfactory/Module.mk @@ -64,7 +64,6 @@ HISTFACTORYDO := $(HISTFACTORYDS:.cxx=.o) HISTFACTORYDH := $(HISTFACTORYDS:.cxx=.h) HISTFACTORYH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/RooStats/HistFactory/*.h)) -HISTFACTORYINCH := $(patsubst $(MODDIRI)/RooStats/HistFactory/%.h,include/RooStats/HistFactory/%.h,$(HISTFACTORYH)) HISTFACTORYS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) HISTFACTORYO := $(call stripsrc,$(HISTFACTORYS:.cxx=.o)) #location of header files for rootcint (cannot use absolute path for win32) @@ -81,9 +80,18 @@ HISTFACTORYLIB := $(LPATH)/libHistFactory.$(SOEXT) HISTFACTORYMAP := $(HISTFACTORYLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(HISTFACTORYINCH) +HISTFACTORYH_REL := $(patsubst $(MODDIRI)/RooStats/HistFactory/%.h,include/RooStats/HistFactory/%.h,$(HISTFACTORYH)) +ALLHDRS += $(HISTFACTORYH_REL) ALLLIBS += $(HISTFACTORYLIB) ALLMAPS += $(HISTFACTORYMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(HISTFACTORYH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Roofit_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(HISTFACTORYLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(HISTFACTORYDEP) @@ -109,15 +117,15 @@ $(HISTFACTORYLIB): $(HISTFACTORYO) $(HISTFACTORYDO) $(ORDER_) $(MAINLIBS) \ $(call pcmrule,HISTFACTORY) $(noop) -$(HISTFACTORYDS): $(HISTFACTORYINCH) $(HISTFACTORYL) $(ROOTCLINGEXE) $(call pcmdep,HISTFACTORY) +$(HISTFACTORYDS): $(HISTFACTORYH_REL) $(HISTFACTORYL) $(ROOTCLINGEXE) $(call pcmdep,HISTFACTORY) $(MAKEDIR) @echo "Generating dictionary $@..." - $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,HISTFACTORY) -c -writeEmptyRootPCM -I$(HISTFACTORYDICTI) $(HISTFACTORYINCH) $(HISTFACTORYL) + $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,HISTFACTORY) -c -writeEmptyRootPCM -I$(HISTFACTORYDICTI) $(HISTFACTORYH_REL) $(HISTFACTORYL) -$(HISTFACTORYMAP): $(HISTFACTORYINCH) $(HISTFACTORYL) $(ROOTCLINGEXE) $(call pcmdep,HISTFACTORY) +$(HISTFACTORYMAP): $(HISTFACTORYH_REL) $(HISTFACTORYL) $(ROOTCLINGEXE) $(call pcmdep,HISTFACTORY) $(MAKEDIR) @echo "Generating rootmap $@..." - $(ROOTCLINGSTAGE2) -r $(HISTFACTORYDS) $(call dictModule,HISTFACTORY) -c -I$(HISTFACTORYDICTI) $(HISTFACTORYINCH) $(HISTFACTORYL) + $(ROOTCLINGSTAGE2) -r $(HISTFACTORYDS) $(call dictModule,HISTFACTORY) -c -I$(HISTFACTORYDICTI) $(HISTFACTORYH_REL) $(HISTFACTORYL) $(HF_MAKEWORKSPACEEXE): $(HF_MAKEWORKSPACEEXEO) $(ROOTLIBSDEP) $(RINTLIB) \ $(HISTFACTORYLIBDEPM) $(HF_PREPAREHISTFACTORY) $(HISTFACTORYLIB) diff --git a/roofit/roofit/Module.mk b/roofit/roofit/Module.mk index 67ecfe0724231..b77aa26f815da 100644 --- a/roofit/roofit/Module.mk +++ b/roofit/roofit/Module.mk @@ -28,9 +28,18 @@ ROOFITLIB := $(LPATH)/libRooFit.$(SOEXT) ROOFITMAP := $(ROOFITLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ROOFITH)) +ROOFITH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(ROOFITH)) +ALLHDRS += $(ROOFITH_REL) ALLLIBS += $(ROOFITLIB) ALLMAPS += $(ROOFITMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(ROOFITH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Roofit_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(ROOFITLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(ROOFITDEP) diff --git a/roofit/roofitcore/Module.mk b/roofit/roofitcore/Module.mk index 15cfa1576bc40..f0b132f783e49 100644 --- a/roofit/roofitcore/Module.mk +++ b/roofit/roofitcore/Module.mk @@ -100,9 +100,18 @@ ROOFITCORELIB := $(LPATH)/libRooFitCore.$(SOEXT) ROOFITCOREMAP := $(ROOFITCORELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ROOFITCOREH)) +ROOFITCOREH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(ROOFITCOREH)) +ALLHDRS += $(ROOFITCOREH_REL) ALLLIBS += $(ROOFITCORELIB) ALLMAPS += $(ROOFITCOREMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(ROOFITCOREH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Roofit_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(ROOFITCORELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(ROOFITCOREDEP) diff --git a/roofit/roostats/Module.mk b/roofit/roostats/Module.mk index 5472ccc70ce5c..b22032b5a6276 100644 --- a/roofit/roostats/Module.mk +++ b/roofit/roostats/Module.mk @@ -19,7 +19,6 @@ ROOSTATSDO := $(ROOSTATSDS:.cxx=.o) ROOSTATSDH := $(ROOSTATSDS:.cxx=.h) ROOSTATSH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/RooStats/*.h)) -ROOSTATSINCH := $(patsubst $(MODDIRI)/RooStats/%.h,include/RooStats/%.h,$(ROOSTATSH)) ROOSTATSS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) ROOSTATSO := $(call stripsrc,$(ROOSTATSS:.cxx=.o)) @@ -29,9 +28,18 @@ ROOSTATSLIB := $(LPATH)/libRooStats.$(SOEXT) ROOSTATSMAP := $(ROOSTATSLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(ROOSTATSINCH) +ROOSTATSH_REL := $(patsubst $(MODDIRI)/RooStats/%.h,include/RooStats/%.h,$(ROOSTATSH)) +ALLHDRS += $(ROOSTATSH_REL) ALLLIBS += $(ROOSTATSLIB) ALLMAPS += $(ROOSTATSMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(ROOSTATSH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Roofit_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(ROOSTATSLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(ROOSTATSDEP) @@ -58,15 +66,15 @@ $(ROOSTATSLIB): $(ROOSTATSO) $(ROOSTATSDO) $(ORDER_) $(MAINLIBS) \ $(call pcmrule,ROOSTATS) $(noop) -$(ROOSTATSDS): $(ROOSTATSINCH) $(ROOSTATSL) $(ROOTCLINGEXE) $(call pcmdep,ROOSTATS) +$(ROOSTATSDS): $(ROOSTATSH_REL) $(ROOSTATSL) $(ROOTCLINGEXE) $(call pcmdep,ROOSTATS) $(MAKEDIR) @echo "Generating dictionary $@..." - $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,ROOSTATS) -c -writeEmptyRootPCM $(ROOSTATSINCH) $(ROOSTATSL) + $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,ROOSTATS) -c -writeEmptyRootPCM $(ROOSTATSH_REL) $(ROOSTATSL) -$(ROOSTATSMAP): $(ROOSTATSINCH) $(ROOSTATSL) $(ROOTCLINGEXE) $(call pcmdep,ROOSTATS) +$(ROOSTATSMAP): $(ROOSTATSH_REL) $(ROOSTATSL) $(ROOTCLINGEXE) $(call pcmdep,ROOSTATS) $(MAKEDIR) @echo "Generating rootmap $@..." - $(ROOTCLINGSTAGE2) -r $(ROOSTATSDS) $(call dictModule,ROOSTATS) -c $(ROOSTATSINCH) $(ROOSTATSL) + $(ROOTCLINGSTAGE2) -r $(ROOSTATSDS) $(call dictModule,ROOSTATS) -c $(ROOSTATSH_REL) $(ROOSTATSL) all-$(MODNAME): $(ROOSTATSLIB) diff --git a/rootx/Module.mk b/rootx/Module.mk index f4c8ae6aeb602..ae2238b5bc1ee 100644 --- a/rootx/Module.mk +++ b/rootx/Module.mk @@ -27,8 +27,17 @@ ROOTXDEP := $(ROOTXO:.o=.d) $(ROOTXXO:.o=.d) ROOTX := bin/root # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ROOTXH)) +ROOTXH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(ROOTXH)) +ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ROOTXH_REL)) ALLEXECS += $(ROOTX) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(ROOTXH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Roofit_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += // link no-library-created \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(ROOTXDEP) diff --git a/sql/mysql/Module.mk b/sql/mysql/Module.mk index 12c906b4c8ce5..78dbc0c1b2972 100644 --- a/sql/mysql/Module.mk +++ b/sql/mysql/Module.mk @@ -28,9 +28,18 @@ MYSQLLIB := $(LPATH)/libRMySQL.$(SOEXT) MYSQLMAP := $(MYSQLLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(MYSQLH)) +MYSQLH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(MYSQLH)) +ALLHDRS += $(MYSQLH_REL) ALLLIBS += $(MYSQLLIB) ALLMAPS += $(MYSQLMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MYSQLH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Sql_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(MYSQLLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(MYSQLDEP) diff --git a/sql/odbc/Module.mk b/sql/odbc/Module.mk index 560c015628290..57f8fe5dc18b5 100644 --- a/sql/odbc/Module.mk +++ b/sql/odbc/Module.mk @@ -28,9 +28,18 @@ ODBCLIB := $(LPATH)/libRODBC.$(SOEXT) ODBCMAP := $(ODBCLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ODBCH)) +ODBCH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(ODBCH)) +ALLHDRS += $(ODBCH_REL) ALLLIBS += $(ODBCLIB) ALLMAPS += $(ODBCMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(ODBCH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Sql_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(ODBCLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(ODBCDEP) diff --git a/sql/oracle/Module.mk b/sql/oracle/Module.mk index 794495f8ec1d1..06ecf3bcb46bd 100644 --- a/sql/oracle/Module.mk +++ b/sql/oracle/Module.mk @@ -28,9 +28,18 @@ ORACLELIB := $(LPATH)/libOracle.$(SOEXT) ORACLEMAP := $(ORACLELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(ORACLEH)) +ORACLEH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(ORACLEH)) +ALLHDRS += $(ORACLEH_REL) ALLLIBS += $(ORACLELIB) ALLMAPS += $(ORACLEMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(ORACLEH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Sql_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(ORACLELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(ORACLEDEP) diff --git a/sql/pgsql/Module.mk b/sql/pgsql/Module.mk index 7b635cb8f539b..0e63fd4ea2bef 100644 --- a/sql/pgsql/Module.mk +++ b/sql/pgsql/Module.mk @@ -28,9 +28,18 @@ PGSQLLIB := $(LPATH)/libPgSQL.$(SOEXT) PGSQLMAP := $(PGSQLLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PGSQLH)) +PGSQLH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(PGSQLH)) +ALLHDRS += $(PGSQLH_REL) ALLLIBS += $(PGSQLLIB) ALLMAPS += $(PGSQLMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(PGSQLH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Sql_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(PGSQLLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(PGSQLDEP) diff --git a/sql/sapdb/Module.mk b/sql/sapdb/Module.mk index 957968532fe7a..c4f0ef05569b4 100644 --- a/sql/sapdb/Module.mk +++ b/sql/sapdb/Module.mk @@ -28,9 +28,18 @@ SAPDBLIB := $(LPATH)/libSapDB.$(SOEXT) SAPDBMAP := $(SAPDBLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(SAPDBH)) +SAPDBH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(SAPDBH)) +ALLHDRS += $(SAPDBH_REL) ALLLIBS += $(SAPDBLIB) ALLMAPS += $(SAPDBMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SAPDBH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Sql_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SAPDBLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(SAPDBDEP) diff --git a/sql/sqlite/Module.mk b/sql/sqlite/Module.mk index 47d4f9714a0cb..bb4b2c440a558 100644 --- a/sql/sqlite/Module.mk +++ b/sql/sqlite/Module.mk @@ -28,9 +28,18 @@ SQLITELIB := $(LPATH)/libRSQLite.$(SOEXT) SQLITEMAP := $(SQLITELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(SQLITEH)) +SQLITEH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(SQLITEH)) +ALLHDRS += $(SQLITEH_REL) ALLLIBS += $(SQLITELIB) ALLMAPS += $(SQLITEMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SQLITEH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Sql_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(SQLITELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(SQLITEDEP) diff --git a/tmva/tmva/Module.mk b/tmva/tmva/Module.mk index 2e5d40620e3d4..5941de67f161d 100644 --- a/tmva/tmva/Module.mk +++ b/tmva/tmva/Module.mk @@ -52,9 +52,6 @@ TMVAH3 := $(patsubst %,$(MODDIRI)/TMVA/%,$(TMVAH3)) TMVAH4 := $(patsubst %,$(MODDIRI)/TMVA/%,$(TMVAH4)) TMVAH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/TMVA/*.h)) -TMVAINCH := $(patsubst $(MODDIRI)/TMVA/%.h,include/TMVA/%.h,$(TMVAH)) -TMVAINCI := $(patsubst $(MODDIRI)/TMVA/%.icc,include/TMVA/%.icc,$(MODDIRI)/TMVA/NeuralNet.icc) \ - $(patsubst $(MODDIRI)/TMVA/DNN/%,include/TMVA/DNN/%,$(TMVADNN)) TMVAS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) TMVADNNS := $(MODDIRS)/DNN/Architectures/Reference.cxx TMVAO := $(call stripsrc,$(TMVAS:.cxx=.o)) $(call stripsrc,$(TMVADNNS:.cxx=.o)) @@ -65,9 +62,18 @@ TMVALIB := $(LPATH)/libTMVA.$(SOEXT) TMVAMAP := $(TMVALIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(TMVAINCH) $(TMVAINCI) +TMVAH_REL := $(patsubst $(MODDIRI)/TMVA/%,include/TMVA/%,$(TMVAH)) +ALLHDRS += $(TMVAH_REL) ALLLIBS += $(TMVALIB) ALLMAPS += $(TMVAMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TMVAH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Tmva_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(TMVALIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(TMVADEP) @@ -102,15 +108,15 @@ $(TMVALIB): $(TMVAO) $(TMVADO) $(ORDER_) $(MAINLIBS) $(TMVALIBDEP) $(call pcmrule,TMVA) $(noop) -$(TMVADS): $(TMVAINCH) $(TMVAL0) $(TMVALS) $(ROOTCLINGEXE) $(call pcmdep,TMVA) +$(TMVADS): $(TMVAH_REL) $(TMVAL0) $(TMVALS) $(ROOTCLINGEXE) $(call pcmdep,TMVA) $(MAKEDIR) @echo "Generating dictionary $@..." - $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,TMVA) -c -writeEmptyRootPCM $(patsubst include/%,%,$(TMVAINCH)) -I$(ROOT_SRCDIR) $(TMVAL0) + $(ROOTCLINGSTAGE2) -f $@ $(call dictModule,TMVA) -c -writeEmptyRootPCM $(patsubst include/%,%,$(TMVAH_REL)) -I$(ROOT_SRCDIR) $(TMVAL0) -$(TMVAMAP): $(TMVAINCH) $(TMVAL0) $(TMVALS) $(ROOTCLINGEXE) $(call pcmdep,TMVA) +$(TMVAMAP): $(TMVAH_REL) $(TMVAL0) $(TMVALS) $(ROOTCLINGEXE) $(call pcmdep,TMVA) $(MAKEDIR) @echo "Generating rootmap $@..." - $(ROOTCLINGSTAGE2) -r $(TMVADS) $(call dictModule,TMVA) -c -I$(ROOT_SRCDIR) $(TMVAINCH) $(TMVAL0) + $(ROOTCLINGSTAGE2) -r $(TMVADS) $(call dictModule,TMVA) -c -I$(ROOT_SRCDIR) $(TMVAH_REL) $(TMVAL0) all-$(MODNAME): $(TMVALIB) diff --git a/tmva/tmvagui/Module.mk b/tmva/tmvagui/Module.mk index cc66d6498d760..368b6a8c6c0d3 100644 --- a/tmva/tmvagui/Module.mk +++ b/tmva/tmvagui/Module.mk @@ -38,9 +38,18 @@ TMVAGUILIB := $(LPATH)/libTMVAGui.$(SOEXT) TMVAGUIMAP := $(TMVAGUILIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/TMVA/%.h,include/TMVA/%.h,$(TMVAGUIH)) +TMVAGUIH_REL := $(patsubst $(MODDIRI)/TMVA/%.h,include/TMVA/%.h,$(TMVAGUIH)) +ALLHDRS += $(TMVAGUIH_REL) ALLLIBS += $(TMVAGUILIB) ALLMAPS += $(TMVAGUIMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TMVAGUIH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Tmva_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(TMVAGUILIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(TMVAGUIDEP) diff --git a/tree/tree/Module.mk b/tree/tree/Module.mk index f646550986935..786e91b9bdee1 100644 --- a/tree/tree/Module.mk +++ b/tree/tree/Module.mk @@ -28,9 +28,18 @@ TREELIB := $(LPATH)/libTree.$(SOEXT) TREEMAP := $(TREELIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(TREEH)) +TREEH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(TREEH)) +ALLHDRS += $(TREEH_REL) ALLLIBS += $(TREELIB) ALLMAPS += $(TREEMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TREEH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Tree_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(TREELIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(TREEDEP) @@ -74,4 +83,4 @@ distclean:: distclean-$(MODNAME) ##### extra rules ###### ifeq ($(BUILDTBB),yes) $(TREEO): CXXFLAGS += $(TBBINCDIR:%=-I%) -endif \ No newline at end of file +endif diff --git a/tree/treeplayer/Module.mk b/tree/treeplayer/Module.mk index 5cba9a2d4f0f0..5d649fd599e67 100644 --- a/tree/treeplayer/Module.mk +++ b/tree/treeplayer/Module.mk @@ -31,9 +31,18 @@ TREEPLAYERLIB := $(LPATH)/libTreePlayer.$(SOEXT) TREEPLAYERMAP := $(TREEPLAYERLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(TREEPLAYERH) $(MODDIRI)/TBranchProxyTemplate.h) +TREEPLAYERH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(TREEPLAYERH)) +ALLHDRS += $(TREEPLAYERH_REL) $(MODDIRI)/TBranchProxyTemplate.h ALLLIBS += $(TREEPLAYERLIB) ALLMAPS += $(TREEPLAYERMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TREEPLAYERH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Tree_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(TREEPLAYERLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(TREEPLAYERDEP) diff --git a/tree/treeviewer/Module.mk b/tree/treeviewer/Module.mk index 7023ba0632f04..4dae907541c95 100644 --- a/tree/treeviewer/Module.mk +++ b/tree/treeviewer/Module.mk @@ -42,9 +42,18 @@ TREEVIEWERLIB := $(LPATH)/libTreeViewer.$(SOEXT) TREEVIEWERMAP := $(TREEVIEWERLIB:.$(SOEXT)=.rootmap) # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(TREEVIEWERH)) +TREEVIEWERH_REL := $(patsubst $(MODDIRI)/%.h,include/%.h,$(TREEVIEWERH)) +ALLHDRS += $(TREEVIEWERH_REL) ALLLIBS += $(TREEVIEWERLIB) ALLMAPS += $(TREEVIEWERMAP) +ifeq ($(CXXMODULES),yes) + CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TREEVIEWERH_REL)) + CXXMODULES_MODULEMAP_CONTENTS += module Tree_$(MODNAME) { \\n + CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS) + CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n" + CXXMODULES_MODULEMAP_CONTENTS += link \"$(TREEVIEWERLIB)\" \\n + CXXMODULES_MODULEMAP_CONTENTS += } \\n +endif # include all dependency files INCLUDEFILES += $(TREEVIEWERDEP)