Revision 8e8882847d428a8f6e4080507e95b42acc6674ad authored by Rene Brun on 26 September 2006, 13:44:50 UTC, committed by Rene Brun on 26 September 2006, 13:44:50 UTC
When loading the geometry from a file, the element table is recreated (never streamed) so the attribute flags (defined/used) of elements are lost. The patch loops over all defined materials/mixtures in this case and restores the flags. Affected: TFluka when geometry was loaded from the file. git-svn-id: http://root.cern.ch/svn/root/trunk@16348 27541ba8-7e3a-0410-8455-c3a389f83636
1 parent 0900218
Module.mk
# Module.mk for graf module
# Copyright (c) 2000 Rene Brun and Fons Rademakers
#
# Author: Fons Rademakers, 29/2/2000
MODDIR := graf
MODDIRS := $(MODDIR)/src
MODDIRI := $(MODDIR)/inc
GRAFDIR := $(MODDIR)
GRAFDIRS := $(GRAFDIR)/src
GRAFDIRI := $(GRAFDIR)/inc
##### libGraf #####
GRAFL1 := $(MODDIRI)/LinkDef1.h
GRAFL2 := $(MODDIRI)/LinkDef2.h
GRAFDS1 := $(MODDIRS)/G__Graf1.cxx
GRAFDS2 := $(MODDIRS)/G__Graf2.cxx
GRAFDO1 := $(GRAFDS1:.cxx=.o)
GRAFDO2 := $(GRAFDS2:.cxx=.o)
GRAFDS := $(GRAFDS1) $(GRAFDS2)
GRAFDO := $(GRAFDO1) $(GRAFDO2)
GRAFDH := $(GRAFDS:.cxx=.h)
GRAFH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
GRAFHD := $(filter-out $(MODDIRI)/TTF.h,$(GRAFH))
GRAFHD := $(filter-out $(MODDIRI)/TText.h,$(GRAFHD))
GRAFHD := $(filter-out $(MODDIRI)/TLatex.h,$(GRAFHD))
GRAFS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
GRAFO := $(GRAFS:.cxx=.o)
GRAFDEP := $(GRAFO:.o=.d) $(GRAFDO:.o=.d)
GRAFLIB := $(LPATH)/libGraf.$(SOEXT)
# used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(GRAFH))
ALLLIBS += $(GRAFLIB)
# include all dependency files
INCLUDEFILES += $(GRAFDEP)
##### local rules #####
include/%.h: $(GRAFDIRI)/%.h
cp $< $@
$(GRAFLIB): $(GRAFO) $(GRAFDO) $(FREETYPEDEP) $(ORDER_) $(MAINLIBS) $(GRAFLIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libGraf.$(SOEXT) $@ \
"$(GRAFO) $(GRAFDO)" \
"$(FREETYPELDFLAGS) $(FREETYPELIB) $(GRAFLIBEXTRA)"
$(GRAFDS1): $(GRAFHD) $(GRAFL1) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GRAFHD) $(GRAFL1)
$(GRAFDS2): $(GRAFH) $(GRAFL2) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(FREETYPEINC) $(GRAFH) $(GRAFL2)
all-graf: $(GRAFLIB)
map-graf: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(GRAFLIB) \
-d $(GRAFLIBDEP) -c $(GRAFL1) $(GRAFL2)
map:: map-graf
clean-graf:
@rm -f $(GRAFO) $(GRAFDO)
clean:: clean-graf
distclean-graf: clean-graf
@rm -f $(GRAFDEP) $(GRAFDS) $(GRAFDH) $(GRAFLIB)
distclean:: distclean-graf
##### extra rules ######
$(GRAFDO2): $(FREETYPEDEP)
$(GRAFDO2): OPT = $(NOOPT)
$(GRAFDO2): CXXFLAGS += $(FREETYPEINC)
graf/src/TTF.o graf/src/TText.o graf/src/TLatex.o: \
$(FREETYPEDEP)
graf/src/TTF.o graf/src/TText.o graf/src/TLatex.o: \
CXXFLAGS += $(FREETYPEINC)
ifeq ($(PLATFORM),win32)
graf/src/TLatex.o: OPT = $(NOOPT)
endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...