Do not add *.icc files in the modulemap.

math/mathcore/Module.mk

@@ -93,7 +93,8 @@ ALLHDRS      += $(MATHCOREMH_REL)
 ALLLIBS      += $(MATHCORELIB)
 ALLMAPS      += $(MATHCOREMAP)
 ifeq ($(CXXMODULES),yes)
-  CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MATHCOREMH_REL))
+  MATHCOREMH_NOICC_REL := $(filter-out $(patsubst $(MODDIRI)/%,include/%,$(MATHCOREMH3)), $(MATHCOREMH_REL))
+  CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(MATHCOREMH_NOICC_REL))
   CXXMODULES_MODULEMAP_CONTENTS += module Math_Core { \\n
   CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS)
   CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n"

math/smatrix/Module.mk

@@ -45,12 +45,13 @@ SMATRIXMAP  := $(SMATRIXLIB:.$(SOEXT)=.rootmap)
 SMATRIXMAP32:= $(SMATRIXLIB:.$(SOEXT)=32.rootmap)
 
 # used in the main Makefile
-SMATRIXH_REL := $(patsubst $(MODDIRI)/Math/%,include/Math/%,$(SMATRIXH))
-ALLHDRS      += $(SMATRIXH_REL)
+SMATRIXH1_REL := $(patsubst $(MODDIRI)/Math/%,include/Math/%,$(SMATRIXH1))
+SMATRIXH2_REL := $(patsubst $(MODDIRI)/Math/%,include/Math/%,$(SMATRIXH2))
+ALLHDRS      += $(SMATRIXH1_REL) $(SMATRIXH2_REL)
 ALLLIBS      += $(SMATRIXLIB)
 ALLMAPS      += $(SMATRIXMAP) $(SMATRIXMAP32)
 ifeq ($(CXXMODULES),yes)
-  CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SMATRIXH_REL))
+  CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(SMATRIXH1_REL))
   CXXMODULES_MODULEMAP_CONTENTS += module Math_$(MODNAME) { \\n
   CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS)
   CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n"

tmva/tmva/Module.mk

@@ -74,7 +74,8 @@ ALLHDRS      += $(TMVA_REL)
 ALLLIBS      += $(TMVALIB)
 ALLMAPS      += $(TMVAMAP)
 ifeq ($(CXXMODULES),yes)
-  CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TMVA_REL))
+  TMVA_NOICC_REL := $(filter-out include/TMVA/NeuralNet.icc, $(TMVA_REL))
+  CXXMODULES_HEADERS := $(patsubst include/%,header \"%\"\\n,$(TMVA_NOICC_REL))
   CXXMODULES_MODULEMAP_CONTENTS += module Tmva_$(MODNAME) { \\n
   CXXMODULES_MODULEMAP_CONTENTS += $(CXXMODULES_HEADERS)
   CXXMODULES_MODULEMAP_CONTENTS += "export \* \\n"