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

Also generate rootmap for Double32_t incarnations of libGenVector.

parent 12c5be02
No related branches found
No related tags found
No related merge requests found
...@@ -68,11 +68,12 @@ GENVECTORDEP := $(GENVECTORO:.o=.d) $(GENVECTORDO:.o=.d) $(GENVECTORDO32:.o=.d) ...@@ -68,11 +68,12 @@ GENVECTORDEP := $(GENVECTORO:.o=.d) $(GENVECTORDO:.o=.d) $(GENVECTORDO32:.o=.d)
GENVECTORLIB := $(LPATH)/libGenVector.$(SOEXT) GENVECTORLIB := $(LPATH)/libGenVector.$(SOEXT)
GENVECTORMAP := $(GENVECTORLIB:.$(SOEXT)=.rootmap) GENVECTORMAP := $(GENVECTORLIB:.$(SOEXT)=.rootmap)
GENVECTORMAP32:= $(GENVECTORLIB:.$(SOEXT)=32.rootmap)
# used in the main Makefile # used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(GENVECTORH)) ALLHDRS += $(patsubst $(MODDIRI)/Math/%.h,include/Math/%.h,$(GENVECTORH))
ALLLIBS += $(GENVECTORLIB) ALLLIBS += $(GENVECTORLIB)
ALLMAPS += $(GENVECTORMAP) ALLMAPS += $(GENVECTORMAP) $(GENVECTORMAP32)
# include all dependency files # include all dependency files
INCLUDEFILES += $(GENVECTORDEP) INCLUDEFILES += $(GENVECTORDEP)
...@@ -87,7 +88,7 @@ include/Math/%.h: $(GENVECTORDIRI)/Math/%.h ...@@ -87,7 +88,7 @@ include/Math/%.h: $(GENVECTORDIRI)/Math/%.h
fi) fi)
cp $< $@ cp $< $@
# build lib genvector: use also obj from math and fit directory # build lib genvector: use also obj from math and fit directory
$(GENVECTORLIB): $(GENVECTORO) $(GENVECTORDO) $(GENVECTORDO32) $(ORDER_) $(MAINLIBS) $(GENVECTORLIB): $(GENVECTORO) $(GENVECTORDO) $(GENVECTORDO32) $(ORDER_) $(MAINLIBS)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libGenVector.$(SOEXT) $@ \ "$(SOFLAGS)" libGenVector.$(SOEXT) $@ \
...@@ -112,7 +113,12 @@ $(GENVECTORMAP): $(GENVECTORDH1) $(GENVECTORL) $(GENVECTORLINC) $(ROOTCLINGEXE) ...@@ -112,7 +113,12 @@ $(GENVECTORMAP): $(GENVECTORDH1) $(GENVECTORL) $(GENVECTORLINC) $(ROOTCLINGEXE)
@echo "Generating rootmap $@..." @echo "Generating rootmap $@..."
$(ROOTCLINGSTAGE2) -r $(GENVECTORDS) $(call dictModule,GENVECTOR) -c $(GENVECTORDH1) $(GENVECTORL) $(ROOTCLINGSTAGE2) -r $(GENVECTORDS) $(call dictModule,GENVECTOR) -c $(GENVECTORDH1) $(GENVECTORL)
all-$(MODNAME): $(GENVECTORLIB) $(GENVECTORMAP) $(GENVECTORMAP32): $(GENVECTORDH1) $(GENVECTORL) $(GENVECTORLINC32) $(ROOTCLINGEXE) $(call pcmdep,GENVECTOR)
$(MAKEDIR)
@echo "Generating rootmap $@..."
$(ROOTCLINGSTAGE2) -r $(GENVECTORDS) $(subst -rmf $(GENVECTORMAP), -rmf $(GENVECTORMAP32),$(call dictModule,GENVECTOR)) -c $(GENVECTORDH1) $(GENVECTORL32)
all-$(MODNAME): $(GENVECTORLIB) $(GENVECTORMAP) $(GENVECTORMAP32)
clean-$(MODNAME): clean-$(MODNAME):
@rm -f $(GENVECTORO) $(GENVECTORDO) $(GENVECTORDO32) @rm -f $(GENVECTORO) $(GENVECTORDO) $(GENVECTORDO32)
...@@ -122,7 +128,7 @@ clean:: clean-$(MODNAME) ...@@ -122,7 +128,7 @@ clean:: clean-$(MODNAME)
distclean-$(MODNAME): clean-$(MODNAME) distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(GENVECTORDEP) $(GENVECTORDS) $(GENVECTORDS32) \ @rm -f $(GENVECTORDEP) $(GENVECTORDS) $(GENVECTORDS32) \
$(GENVECTORDH) $(GENVECTORDH32) \ $(GENVECTORDH) $(GENVECTORDH32) \
$(GENVECTORLIB) $(GENVECTORMAP) $(GENVECTORLIB) $(GENVECTORMAP) $(GENVECTORMAP32)
ifneq ($(ROOT_OBJDIR),$(ROOT_SRCDIR)) ifneq ($(ROOT_OBJDIR),$(ROOT_SRCDIR))
@rm -rf $(GENVECTORDIRT) @rm -rf $(GENVECTORDIRT)
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment