Skip to content
Snippets Groups Projects
Commit d5099b7e authored by Axel Naumann's avatar Axel Naumann
Browse files

Also generate rootmap for Double32_t incarnations of libSMatrix.

parent fae3e9aa
No related branches found
No related tags found
No related merge requests found
...@@ -42,12 +42,13 @@ SMATRIXDEP := $(SMATRIXO:.o=.d) $(SMATRIXDO:.o=.d) $(SMATRIXDO32:.o=.d) ...@@ -42,12 +42,13 @@ SMATRIXDEP := $(SMATRIXO:.o=.d) $(SMATRIXDO:.o=.d) $(SMATRIXDO32:.o=.d)
SMATRIXLIB := $(LPATH)/libSmatrix.$(SOEXT) SMATRIXLIB := $(LPATH)/libSmatrix.$(SOEXT)
SMATRIXMAP := $(SMATRIXLIB:.$(SOEXT)=.rootmap) SMATRIXMAP := $(SMATRIXLIB:.$(SOEXT)=.rootmap)
SMATRIXMAP32:= $(SMATRIXLIB:.$(SOEXT)=32.rootmap)
# used in the main Makefile # used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(SMATRIXH1)) ALLHDRS += $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(SMATRIXH1))
ALLHDRS += $(patsubst $(MODDIRI)/Math/%.icc,include/Math/%.icc,$(SMATRIXH2)) ALLHDRS += $(patsubst $(MODDIRI)/Math/%.icc,include/Math/%.icc,$(SMATRIXH2))
ALLLIBS += $(SMATRIXLIB) ALLLIBS += $(SMATRIXLIB)
ALLMAPS += $(SMATRIXMAP) ALLMAPS += $(SMATRIXMAP) $(SMATRIXMAP32)
# include all dependency files # include all dependency files
INCLUDEFILES += $(SMATRIXDEP) INCLUDEFILES += $(SMATRIXDEP)
...@@ -92,6 +93,11 @@ $(SMATRIXMAP): $(SMATRIXDH1) $(SMATRIXL) $(SMATRIXLINC) $(ROOTCLINGEXE) $(call ...@@ -92,6 +93,11 @@ $(SMATRIXMAP): $(SMATRIXDH1) $(SMATRIXL) $(SMATRIXLINC) $(ROOTCLINGEXE) $(call
@echo "Generating rootmap $@..." @echo "Generating rootmap $@..."
$(ROOTCLINGSTAGE2) -r $(SMATRIXDS) $(call dictModule,SMATRIX) -c $(SMATRIXDH1) $(SMATRIXL) $(ROOTCLINGSTAGE2) -r $(SMATRIXDS) $(call dictModule,SMATRIX) -c $(SMATRIXDH1) $(SMATRIXL)
$(SMATRIXMAP32): $(SMATRIXDH1) $(SMATRIXL32) $(SMATRIXLINC) $(ROOTCLINGEXE) $(call pcmdep,SMATRIX)
$(MAKEDIR)
@echo "Generating rootmap $@..."
$(ROOTCLINGSTAGE2) -r $(SMATRIXDS) $(subst -rmf $(SMATRIXMAP), -rmf $(SMATRIXMAP32),$(call dictModule,SMATRIX)) -c $(SMATRIXDH1) $(SMATRIXL32)
ifneq ($(ICC_MAJOR),) ifneq ($(ICC_MAJOR),)
# silence warning messages about subscripts being out of range # silence warning messages about subscripts being out of range
$(SMATRIXDO): CXXFLAGS += -wd175 -I$(SMATRIXDIRI) $(SMATRIXDO): CXXFLAGS += -wd175 -I$(SMATRIXDIRI)
...@@ -110,7 +116,7 @@ clean:: clean-$(MODNAME) ...@@ -110,7 +116,7 @@ clean:: clean-$(MODNAME)
distclean-$(MODNAME): clean-$(MODNAME) distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(SMATRIXDEP) $(SMATRIXDS) $(SMATRIXDS32) $(SMATRIXDH) \ @rm -f $(SMATRIXDEP) $(SMATRIXDS) $(SMATRIXDS32) $(SMATRIXDH) \
$(SMATRIXDH32) $(SMATRIXLIB) $(SMATRIXMAP) $(SMATRIXDH32) $(SMATRIXLIB) $(SMATRIXMAP) $(SMATRIXMAP32)
@rm -rf include/Math @rm -rf include/Math
ifneq ($(ROOT_OBJDIR),$(ROOT_SRCDIR)) ifneq ($(ROOT_OBJDIR),$(ROOT_SRCDIR))
@rm -rf $(SMATRIXDIRT) @rm -rf $(SMATRIXDIRT)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment