Revision 1346acd0c29a37f3c4d21edb660aff8d3bb62632 authored by Philippe Canal on 28 March 2014, 19:13:34 UTC, committed by Philippe Canal on 02 April 2014, 08:03:33 UTC
This solves ROOT-5778 by making sure that
TClassEdit::ResolveTypedef("const std::string&")
and
TClassEdit::ResolveTypedef("const std::string &")
returns "const std::string&"
This is a redo of 32df5a03fe2371d9ac46380ea6163d0519bbf711
which was inadvertently removed in 3d8b0cd4d0a3708885bd75e98d4b972a751a0a67
1 parent 11eec6f
Module.mk
# Module.mk for pythia6 module
# Copyright (c) 2000 Rene Brun and Fons Rademakers
#
# Author: Fons Rademakers, 29/2/2000
MODNAME := pythia6
MODDIR := $(ROOT_SRCDIR)/montecarlo/$(MODNAME)
MODDIRS := $(MODDIR)/src
MODDIRI := $(MODDIR)/inc
PYTHIA6DIR := $(MODDIR)
PYTHIA6DIRS := $(PYTHIA6DIR)/src
PYTHIA6DIRI := $(PYTHIA6DIR)/inc
##### libEGPythia6 #####
PYTHIA6L := $(MODDIRI)/LinkDef.h
PYTHIA6DS := $(call stripsrc,$(MODDIRS)/G__Pythia6.cxx)
PYTHIA6DO := $(PYTHIA6DS:.cxx=.o)
PYTHIA6DH := $(PYTHIA6DS:.cxx=.h)
PYTHIA6H := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
PYTHIA6S := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
PYTHIA6O := $(call stripsrc,$(PYTHIA6S:.cxx=.o))
PYTHIA6DEP := $(PYTHIA6O:.o=.d) $(PYTHIA6DO:.o=.d)
PYTHIA6LIB := $(LPATH)/libEGPythia6.$(SOEXT)
PYTHIA6MAP := $(PYTHIA6LIB:.$(SOEXT)=.rootmap)
PYTHIA6LDF := $(LDFLAGS)
ifeq ($(FPYTHIA6LIB),)
ifeq ($(PLATFORM),linux)
# Pythia library not provided at config time
# we have to turn-off the "-Wl,--no-undefined" linker flag
PYTHIA6LDF := $(filter-out %no-undefined,$(LDFLAGS))
endif
ifeq ($(PLATFORM),macosx)
# Pythia library not provided at config time
# we have to add the "-undefined dynamic_lookup" linker flag
PYTHIA6LDF += -undefined dynamic_lookup
endif
endif
# used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(PYTHIA6H))
ALLLIBS += $(PYTHIA6LIB)
ALLMAPS += $(PYTHIA6MAP)
# include all dependency files
INCLUDEFILES += $(PYTHIA6DEP)
##### local rules #####
.PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
include/%.h: $(PYTHIA6DIRI)/%.h
cp $< $@
$(PYTHIA6LIB): $(PYTHIA6O) $(PYTHIA6DO) $(ORDER_) $(MAINLIBS) $(PYTHIA6LIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(PYTHIA6LDF)" \
"$(SOFLAGS)" libEGPythia6.$(SOEXT) $@ \
"$(PYTHIA6O) $(PYTHIA6DO)" \
"$(PYTHIA6LIBEXTRA) $(FPYTHIA6LIBDIR) $(FPYTHIA6LIB)"
$(call pcmrule,PYTHIA6)
$(noop)
$(PYTHIA6DS): $(PYTHIA6H) $(PYTHIA6L) $(ROOTCINTTMPDEP) $(call pcmdep,PYTHIA6)
$(MAKEDIR)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ $(call dictModule,PYTHIA6) -c $(PYTHIA6H) $(PYTHIA6L)
$(PYTHIA6MAP): $(PYTHIA6H) $(PYTHIA6L) $(ROOTCINTTMPDEP) $(call pcmdep,PYTHIA6)
$(MAKEDIR)
@echo "Generating rootmap $@..."
$(ROOTCINTTMP) -r $(PYTHIA6DS) $(call dictModule,PYTHIA6) -c $(PYTHIA6H) $(PYTHIA6L)
all-$(MODNAME): $(PYTHIA6LIB)
clean-$(MODNAME):
@rm -f $(PYTHIA6O) $(PYTHIA6DO)
clean:: clean-$(MODNAME)
distclean-$(MODNAME): clean-$(MODNAME)
@rm -f $(PYTHIA6DEP) $(PYTHIA6DS) $(PYTHIA6DH) \
$(PYTHIA6LIB) $(PYTHIA6MAP)
distclean:: distclean-$(MODNAME)
##### extra rules ######
$(PYTHIA6O): CXXFLAGS += $(FPYTHIA6CPPFLAGS)
Computing file changes ...
