Page Menu
Home
HEPForge
Search
Configure Global Search
Log In
Files
F9501623
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
50 KB
Subscribers
None
View Options
diff --git a/Analysis/Makefile.am b/Analysis/Makefile.am
--- a/Analysis/Makefile.am
+++ b/Analysis/Makefile.am
@@ -1,59 +1,59 @@
pkglib_LTLIBRARIES = HwAnalysis.la
-HwAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:3:0
+HwAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 10:0:0
HwAnalysis_la_SOURCES = \
EventShapes.cc EventShapes.fh EventShapes.h \
EventShapesMasterAnalysis.cc EventShapesMasterAnalysis.h \
BasicConsistency.cc BasicConsistency.h \
LEPMultiplicityCount.cc LEPMultiplicityCount.h \
MultiplicityInfo.h \
LEPBMultiplicity.cc\
LEPBMultiplicity.h \
SimpleLHCAnalysis.h SimpleLHCAnalysis.cc\
TTbarAnalysis.h TTbarAnalysis.cc\
LPairAnalysis.h LPairAnalysis.cc\
GammaGammaAnalysis.h GammaGammaAnalysis.cc\
GammaJetAnalysis.h GammaJetAnalysis.cc\
HiggsJetAnalysis.h HiggsJetAnalysis.cc \
ParallelRunAnalysis.h ParallelRunAnalysis.cc \
DrellYanPT.h DrellYanPT.cc
pkglib_LTLIBRARIES += HwJetsAnalysis.la
-HwJetsAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwJetsAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwJetsAnalysis_la_SOURCES = \
LeptonsJetsAnalysis.h LeptonsJetsAnalysis.cc \
JetsPlusAnalysis.h JetsPlusAnalysis.cc \
HJetsAnalysis.h HJetsAnalysis.cc \
ZJetsAnalysis.h ZJetsAnalysis.cc \
TTJetsAnalysis.h TTJetsAnalysis.cc \
CrossSectionAnalysis.h CrossSectionAnalysis.cc
pkglib_LTLIBRARIES += HwLEPAnalysis.la
-HwLEPAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0
+HwLEPAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:0:0
HwLEPAnalysis_la_SOURCES = \
BFragmentationAnalysisHandler.cc BFragmentationAnalysisHandler.h\
SingleParticleAnalysis.cc SingleParticleAnalysis.h\
LEPEventShapes.cc LEPEventShapes.h\
IdentifiedParticleAnalysis.cc IdentifiedParticleAnalysis.h\
BELLECharmAnalysis.h BELLECharmAnalysis.cc\
CLEOCharmAnalysis.h CLEOCharmAnalysis.cc
# analysis code which depends on fastjet
if WANT_LIBFASTJET
pkglib_LTLIBRARIES += HwLEPJetAnalysis.la
-HwLEPJetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+HwLEPJetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
HwLEPJetAnalysis_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) \
-I$(FASTJETPATH)
-HwLEPJetAnalysis_la_LIBADD = $(FASTJETLIBS)
+HwLEPJetAnalysis_la_LIBADD = $(FASTJETLIBS)
HwLEPJetAnalysis_la_SOURCES = \
LEPJetAnalysis.cc LEPJetAnalysis.h\
LEPFourJetsAnalysis.cc LEPFourJetsAnalysis.h
endif
pkglib_LTLIBRARIES += HwTevatronAnalysis.la
-HwTevatronAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwTevatronAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwTevatronAnalysis_la_CPPFLAGS = $(AM_CPPFLAGS)
HwTevatronAnalysis_la_SOURCES = \
ZpTRun2.cc ZpTRun2.h \
ZpTRun1.cc ZpTRun1.h \
Wpt.cc Wpt.h \
-Zrapidity.cc Zrapidity.h
+Zrapidity.cc Zrapidity.h
diff --git a/Decay/Baryon/Makefile.am b/Decay/Baryon/Makefile.am
--- a/Decay/Baryon/Makefile.am
+++ b/Decay/Baryon/Makefile.am
@@ -1,23 +1,23 @@
pkglib_LTLIBRARIES = HwBaryonDecay.la
-HwBaryonDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:1:0
+HwBaryonDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
HwBaryonDecay_la_LIBADD = $(top_builddir)/PDT/libHwBaryonWidth.la
HwBaryonDecay_la_SOURCES = \
Baryon1MesonDecayerBase.cc Baryon1MesonDecayerBase.h \
Baryon1MesonDecayerBase.fh\
BaryonFactorizedDecayer.cc BaryonFactorizedDecayer.h \
KornerKramerCharmDecayer.cc KornerKramerCharmDecayer.h \
NonLeptonicHyperonDecayer.cc NonLeptonicHyperonDecayer.h \
RadiativeHyperonDecayer.cc RadiativeHyperonDecayer.h \
NonLeptonicOmegaDecayer.cc NonLeptonicOmegaDecayer.h \
OmegaXiStarPionDecayer.cc OmegaXiStarPionDecayer.h \
SemiLeptonicBaryonDecayer.cc SemiLeptonicBaryonDecayer.h \
StrongHeavyBaryonDecayer.cc StrongHeavyBaryonDecayer.h \
SU3BaryonDecupletOctetPhotonDecayer.cc SU3BaryonDecupletOctetPhotonDecayer.h\
SU3BaryonDecupletOctetScalarDecayer.cc SU3BaryonDecupletOctetScalarDecayer.h\
SU3BaryonOctetDecupletScalarDecayer.cc SU3BaryonOctetDecupletScalarDecayer.h\
SU3BaryonOctetOctetPhotonDecayer.cc SU3BaryonOctetOctetPhotonDecayer.h \
SU3BaryonOctetOctetScalarDecayer.cc SU3BaryonOctetOctetScalarDecayer.h \
SU3BaryonSingletOctetPhotonDecayer.cc SU3BaryonSingletOctetPhotonDecayer.h \
SU3BaryonSingletOctetScalarDecayer.cc SU3BaryonSingletOctetScalarDecayer.h \
RadiativeHeavyBaryonDecayer.cc RadiativeHeavyBaryonDecayer.h
diff --git a/Decay/FormFactors/Makefile.am b/Decay/FormFactors/Makefile.am
--- a/Decay/FormFactors/Makefile.am
+++ b/Decay/FormFactors/Makefile.am
@@ -1,31 +1,31 @@
noinst_LTLIBRARIES = libHwFormFactor.la
pkglib_LTLIBRARIES = HwFormFactors.la
libHwFormFactor_la_SOURCES = \
BaryonFormFactor.cc BaryonFormFactor.fh \
BaryonFormFactor.h \
ScalarFormFactor.cc ScalarFormFactor.fh \
ScalarFormFactor.h \
BtoSGammaHadronicMass.h \
BtoSGammaHadronicMass.cc BtoSGammaHadronicMass.fh
-HwFormFactors_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+HwFormFactors_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
HwFormFactors_la_SOURCES = \
BallZwickyScalarFormFactor.cc BallZwickyScalarFormFactor.h \
BallZwickyVectorFormFactor.cc BallZwickyVectorFormFactor.h \
BaryonSimpleFormFactor.cc BaryonSimpleFormFactor.h \
BaryonThreeQuarkModelFormFactor.cc BaryonThreeQuarkModelFormFactor.h \
ChengHeavyBaryonFormFactor.cc ChengHeavyBaryonFormFactor.h \
ISGW2FormFactor.cc ISGW2FormFactor.h \
ISGWFormFactor.cc ISGWFormFactor.h \
LambdabExcitedLambdacSumRuleFormFactor.cc \
LambdabExcitedLambdacSumRuleFormFactor.h \
LightBaryonQuarkModelFormFactor.cc LightBaryonQuarkModelFormFactor.h \
SingletonFormFactor.cc SingletonFormFactor.h\
WSBFormFactor.cc WSBFormFactor.h\
KiselevBcFormFactor.cc KiselevBcFormFactor.h\
MelikhovFormFactor.cc MelikhovFormFactor.h \
MelikhovStechFormFactor.cc MelikhovStechFormFactor.h \
BtoSGammaFlatEnergy.h BtoSGammaFlatEnergy.cc \
BtoSGammaKagan.h BtoSGammaKagan.cc\
HQETFormFactor.h HQETFormFactor.cc
diff --git a/Decay/Makefile.am b/Decay/Makefile.am
--- a/Decay/Makefile.am
+++ b/Decay/Makefile.am
@@ -1,26 +1,26 @@
SUBDIRS = FormFactors Tau Baryon VectorMeson Perturbative \
WeakCurrents ScalarMeson TensorMeson Partonic General Radiation
-noinst_LTLIBRARIES = libHwDecay.la
+noinst_LTLIBRARIES = libHwDecay.la
pkglib_LTLIBRARIES = Hw64Decay.la HwMamboDecay.la
-Hw64Decay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:0:0
-Hw64Decay_la_SOURCES = Hw64Decayer.h Hw64Decayer.cc
+Hw64Decay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+Hw64Decay_la_SOURCES = Hw64Decayer.h Hw64Decayer.cc
-HwMamboDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
-HwMamboDecay_la_SOURCES = MamboDecayer.h MamboDecayer.cc
+HwMamboDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
+HwMamboDecay_la_SOURCES = MamboDecayer.h MamboDecayer.cc
libHwDecay_la_LIBADD = $(top_builddir)/PDT/libHwPDT.la
libHwDecay_la_SOURCES = \
DecayIntegrator.cc DecayIntegrator.fh DecayIntegrator.h \
DecayPhaseSpaceChannel.cc DecayPhaseSpaceChannel.fh \
DecayPhaseSpaceChannel.h \
DecayPhaseSpaceMode.cc DecayPhaseSpaceMode.fh \
DecayPhaseSpaceMode.h \
HwDecayerBase.cc HwDecayerBase.fh HwDecayerBase.h \
HwDecayHandler.cc HwDecayHandler.h\
DecayVertex.fh DecayVertex.h DecayVertex.cc \
DecayMatrixElement.h DecayMatrixElement.cc DecayMatrixElement.fh \
TwoBodyDecayMatrixElement.h TwoBodyDecayMatrixElement.cc \
GeneralDecayMatrixElement.h GeneralDecayMatrixElement.cc GeneralDecayMatrixElement.fh \
BranchingRatioReweighter.h BranchingRatioReweighter.cc
diff --git a/Decay/Partonic/Makefile.am b/Decay/Partonic/Makefile.am
--- a/Decay/Partonic/Makefile.am
+++ b/Decay/Partonic/Makefile.am
@@ -1,9 +1,9 @@
pkglib_LTLIBRARIES = HwPartonicDecay.la
HwPartonicDecay_la_SOURCES = \
QuarkoniumDecayer.h QuarkoniumDecayer.cc \
HeavyDecayer.h HeavyDecayer.cc \
WeakPartonicDecayer.h WeakPartonicDecayer.cc\
BtoSGammaDecayer.h BtoSGammaDecayer.cc\
-PartonicDecayerBase.h PartonicDecayerBase.cc
+PartonicDecayerBase.h PartonicDecayerBase.cc
-HwPartonicDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+HwPartonicDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
diff --git a/Decay/Perturbative/Makefile.am b/Decay/Perturbative/Makefile.am
--- a/Decay/Perturbative/Makefile.am
+++ b/Decay/Perturbative/Makefile.am
@@ -1,18 +1,17 @@
pkglib_LTLIBRARIES = HwPerturbativeDecay.la HwPerturbativeHiggsDecay.la
HwPerturbativeDecay_la_SOURCES = \
SMWDecayer.cc SMWDecayer.h\
SMZDecayer.cc SMZDecayer.h\
SMTopDecayer.cc SMTopDecayer.h\
SMTopPOWHEGDecayer.cc SMTopPOWHEGDecayer.h\
SMZFermionsPOWHEGDecayer.cc SMZFermionsPOWHEGDecayer.h\
SMWFermionsPOWHEGDecayer.cc SMWFermionsPOWHEGDecayer.h
-HwPerturbativeDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+HwPerturbativeDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
HwPerturbativeHiggsDecay_la_SOURCES = \
SMHiggsFermionsDecayer.cc SMHiggsFermionsDecayer.h \
SMHiggsFermionsPOWHEGDecayer.cc SMHiggsFermionsPOWHEGDecayer.h \
SMHiggsGGHiggsPPDecayer.cc SMHiggsGGHiggsPPDecayer.h\
- SMHiggsWWDecayer.cc SMHiggsWWDecayer.h
-HwPerturbativeHiggsDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
-
+ SMHiggsWWDecayer.cc SMHiggsWWDecayer.h
+HwPerturbativeHiggsDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
diff --git a/Decay/Radiation/Makefile.am b/Decay/Radiation/Makefile.am
--- a/Decay/Radiation/Makefile.am
+++ b/Decay/Radiation/Makefile.am
@@ -1,15 +1,15 @@
noinst_LTLIBRARIES = libHwDecRad.la
pkglib_LTLIBRARIES = HwSOPHTY.la
libHwDecRad_la_SOURCES = \
DecayRadiationGenerator.cc DecayRadiationGenerator.h \
DecayRadiationGenerator.fh \
QEDRadiationHandler.cc QEDRadiationHandler.fh\
QEDRadiationHandler.h
HwSOPHTY_la_SOURCES = \
SOPHTY.h SOPHTY.cc \
FFDipole.cc FFDipole.fh FFDipole.h \
IFDipole.cc IFDipole.fh IFDipole.h \
YFSFormFactors.cc YFSFormFactors.h
-HwSOPHTY_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:1:0
+HwSOPHTY_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
diff --git a/Decay/ScalarMeson/Makefile.am b/Decay/ScalarMeson/Makefile.am
--- a/Decay/ScalarMeson/Makefile.am
+++ b/Decay/ScalarMeson/Makefile.am
@@ -1,20 +1,20 @@
pkglib_LTLIBRARIES = HwSMDecay.la
HwSMDecay_la_SOURCES = \
EtaPiGammaGammaDecayer.cc EtaPiGammaGammaDecayer.h\
EtaPiPiGammaDecayer.cc EtaPiPiGammaDecayer.h \
EtaPiPiPiDecayer.cc EtaPiPiPiDecayer.h \
PScalar4FermionsDecayer.cc PScalar4FermionsDecayer.h\
PScalarLeptonNeutrinoDecayer.cc PScalarLeptonNeutrinoDecayer.h\
PScalarPScalarVectorDecayer.cc PScalarPScalarVectorDecayer.h \
PScalarVectorFermionsDecayer.cc PScalarVectorFermionsDecayer.h\
PScalarVectorVectorDecayer.cc PScalarVectorVectorDecayer.h\
ScalarMesonTensorScalarDecayer.cc ScalarMesonTensorScalarDecayer.h\
ScalarScalarScalarDecayer.cc ScalarScalarScalarDecayer.h \
SemiLeptonicScalarDecayer.cc SemiLeptonicScalarDecayer.h \
ScalarMesonFactorizedDecayer.cc ScalarMesonFactorizedDecayer.h \
ScalarVectorVectorDecayer.h ScalarVectorVectorDecayer.cc \
DtoKPiPiCLEO.h DtoKPiPiCLEO.cc \
DtoKPiPiE691.h DtoKPiPiE691.cc\
DtoKPiPiMarkIII.h DtoKPiPiMarkIII.cc
-HwSMDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:1:0
+HwSMDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 10:0:0
diff --git a/Decay/Tau/Makefile.am b/Decay/Tau/Makefile.am
--- a/Decay/Tau/Makefile.am
+++ b/Decay/Tau/Makefile.am
@@ -1,4 +1,4 @@
pkglib_LTLIBRARIES = HwTauDecay.la
HwTauDecay_la_SOURCES = TauDecayer.cc TauDecayer.h
-HwTauDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+HwTauDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
diff --git a/Decay/TensorMeson/Makefile.am b/Decay/TensorMeson/Makefile.am
--- a/Decay/TensorMeson/Makefile.am
+++ b/Decay/TensorMeson/Makefile.am
@@ -1,7 +1,7 @@
pkglib_LTLIBRARIES = HwTMDecay.la
HwTMDecay_la_SOURCES = \
TensorMeson2PScalarDecayer.cc TensorMeson2PScalarDecayer.h\
TensorMesonVectorPScalarDecayer.cc TensorMesonVectorPScalarDecayer.h \
TensorMesonVectorVectorDecayer.cc TensorMesonVectorVectorDecayer.h
-HwTMDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:0:0
+HwTMDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
diff --git a/Decay/VectorMeson/Makefile.am b/Decay/VectorMeson/Makefile.am
--- a/Decay/VectorMeson/Makefile.am
+++ b/Decay/VectorMeson/Makefile.am
@@ -1,17 +1,17 @@
pkglib_LTLIBRARIES = HwVMDecay.la
HwVMDecay_la_SOURCES = \
a1ThreePionCLEODecayer.cc a1ThreePionCLEODecayer.h \
a1SimpleDecayer.cc a1SimpleDecayer.h\
a1ThreePionDecayer.cc a1ThreePionDecayer.h \
PVectorMesonVectorPScalarDecayer.cc PVectorMesonVectorPScalarDecayer.h \
VectorMeson2FermionDecayer.cc VectorMeson2FermionDecayer.h \
VectorMeson2MesonDecayer.cc VectorMeson2MesonDecayer.h \
VectorMeson3PionDecayer.cc VectorMeson3PionDecayer.h \
VectorMesonPScalarFermionsDecayer.cc VectorMesonPScalarFermionsDecayer.h \
VectorMesonPVectorPScalarDecayer.cc VectorMesonPVectorPScalarDecayer.h \
VectorMesonVectorPScalarDecayer.cc VectorMesonVectorPScalarDecayer.h \
VectorMesonVectorScalarDecayer.cc VectorMesonVectorScalarDecayer.h \
VectorMesonVectorVectorDecayer.cc VectorMesonVectorVectorDecayer.h \
OniumToOniumPiPiDecayer.cc OniumToOniumPiPiDecayer.h
-HwVMDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:2:0
+HwVMDecay_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
diff --git a/Decay/WeakCurrents/Makefile.am b/Decay/WeakCurrents/Makefile.am
--- a/Decay/WeakCurrents/Makefile.am
+++ b/Decay/WeakCurrents/Makefile.am
@@ -1,20 +1,20 @@
-pkglib_LTLIBRARIES = HwWeakCurrents.la
-noinst_LTLIBRARIES = libHwWeakCurrent.la
+pkglib_LTLIBRARIES = HwWeakCurrents.la
+noinst_LTLIBRARIES = libHwWeakCurrent.la
libHwWeakCurrent_la_SOURCES = \
WeakDecayCurrent.cc WeakDecayCurrent.fh WeakDecayCurrent.h\
LeptonNeutrinoCurrent.cc LeptonNeutrinoCurrent.fh \
LeptonNeutrinoCurrent.h
-HwWeakCurrents_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+HwWeakCurrents_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
HwWeakCurrents_la_SOURCES = \
FourPionNovosibirskCurrent.cc FourPionNovosibirskCurrent.h \
ScalarMesonCurrent.cc ScalarMesonCurrent.h\
ThreeMesonCurrentBase.cc ThreeMesonCurrentBase.h \
ThreeMesonDefaultCurrent.cc ThreeMesonDefaultCurrent.h\
ThreePionCLEOCurrent.cc ThreePionCLEOCurrent.h\
TwoMesonRhoKStarCurrent.cc TwoMesonRhoKStarCurrent.h\
TwoPionPhotonCurrent.cc TwoPionPhotonCurrent.h\
VectorMesonCurrent.cc VectorMesonCurrent.h\
FivePionCurrent.cc FivePionCurrent.h \
KPiCurrent.cc KPiCurrent.h\
KaonThreeMesonCurrent.cc KaonThreeMesonCurrent.h
diff --git a/DipoleShower/AlphaS/Makefile.am b/DipoleShower/AlphaS/Makefile.am
--- a/DipoleShower/AlphaS/Makefile.am
+++ b/DipoleShower/AlphaS/Makefile.am
@@ -1,14 +1,14 @@
pkglib_LTLIBRARIES = HwDipoleShowerAlphaS.la
-HwDipoleShowerAlphaS_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:1:0
+HwDipoleShowerAlphaS_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwDipoleShowerAlphaS_la_SOURCES = \
alpha_s.h \
alpha_s.cc \
lo_alpha_s.h \
lo_alpha_s.cc \
nlo_alpha_s.h \
nlo_alpha_s.cc \
gsl.h \
gsl.tcc \
gsl.cc
diff --git a/DipoleShower/Makefile.am b/DipoleShower/Makefile.am
--- a/DipoleShower/Makefile.am
+++ b/DipoleShower/Makefile.am
@@ -1,15 +1,14 @@
SUBDIRS = Base Kernels Kinematics Utility AlphaS
pkglib_LTLIBRARIES = HwDipoleShower.la
-HwDipoleShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
+HwDipoleShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
HwDipoleShower_la_LIBADD = \
Base/libHwDipoleShowerBase.la \
Kernels/libHwDipoleShowerKernels.la \
Kinematics/libHwDipoleShowerKinematics.la \
Utility/libHwDipoleShowerUtility.la
HwDipoleShower_la_SOURCES = \
DipoleShowerHandler.h DipoleShowerHandler.cc
-
diff --git a/MatrixElement/DIS/Makefile.am b/MatrixElement/DIS/Makefile.am
--- a/MatrixElement/DIS/Makefile.am
+++ b/MatrixElement/DIS/Makefile.am
@@ -1,6 +1,6 @@
pkglib_LTLIBRARIES = HwMEDIS.la
HwMEDIS_la_SOURCES = \
DISBase.h DISBase.cc \
MENeutralCurrentDIS.cc MENeutralCurrentDIS.h \
-MEChargedCurrentDIS.cc MEChargedCurrentDIS.h
-HwMEDIS_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
+MEChargedCurrentDIS.cc MEChargedCurrentDIS.h
+HwMEDIS_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0
diff --git a/MatrixElement/Gamma/Makefile.am b/MatrixElement/Gamma/Makefile.am
--- a/MatrixElement/Gamma/Makefile.am
+++ b/MatrixElement/Gamma/Makefile.am
@@ -1,10 +1,10 @@
pkglib_LTLIBRARIES = HwMEGammaGamma.la HwMEGammaHadron.la
HwMEGammaGamma_la_SOURCES = \
MEGammaGamma2ff.cc MEGammaGamma2ff.h \
MEGammaGamma2WW.cc MEGammaGamma2WW.h
-HwMEGammaGamma_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
+HwMEGammaGamma_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
HwMEGammaHadron_la_SOURCES = \
-MEGammaP2Jets.cc MEGammaP2Jets.h
-HwMEGammaHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
+MEGammaP2Jets.cc MEGammaP2Jets.h
+HwMEGammaHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
diff --git a/MatrixElement/Hadron/Makefile.am b/MatrixElement/Hadron/Makefile.am
--- a/MatrixElement/Hadron/Makefile.am
+++ b/MatrixElement/Hadron/Makefile.am
@@ -1,27 +1,27 @@
pkglib_LTLIBRARIES = HwMEHadron.la
HwMEHadron_la_SOURCES = \
MEqq2gZ2ff.cc MEqq2gZ2ff.h \
MEqq2W2ff.cc MEqq2W2ff.h \
MEPP2GammaJet.h MEPP2GammaJet.cc\
MEQCD2to2.h MEQCD2to2.cc\
MEPP2HiggsJet.h MEPP2HiggsJet.cc\
MEPP2GammaGamma.h MEPP2GammaGamma.cc \
MEPP2QQ.h MEPP2QQ.cc \
MEPP2QQHiggs.h MEPP2QQHiggs.cc \
MEPP2Higgs.h MEPP2Higgs.cc\
MEPP2WH.h MEPP2WH.cc \
MEPP2ZH.h MEPP2ZH.cc \
MEPP2WJet.cc MEPP2WJet.h \
MEPP2ZJet.cc MEPP2ZJet.h \
MEPP2VV.cc MEPP2VV.h \
MEPP2VGamma.cc MEPP2VGamma.h \
MEPP2HiggsVBF.cc MEPP2HiggsVBF.h \
MEPP2SingleTop.cc MEPP2SingleTop.h \
MEMinBias.h MEMinBias.cc
-HwMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0
+HwMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:0:0
pkglib_LTLIBRARIES += HwMEHadronFast.la
HwMEHadronFast_la_SOURCES = \
MEQCD2to2Fast.h MEQCD2to2Fast.cc
-HwMEHadronFast_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
+HwMEHadronFast_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
diff --git a/MatrixElement/Lepton/Makefile.am b/MatrixElement/Lepton/Makefile.am
--- a/MatrixElement/Lepton/Makefile.am
+++ b/MatrixElement/Lepton/Makefile.am
@@ -1,9 +1,9 @@
pkglib_LTLIBRARIES = HwMELepton.la
HwMELepton_la_SOURCES = \
MEee2gZ2qq.h MEee2gZ2qq.cc\
MEee2gZ2ll.h MEee2gZ2ll.cc\
MEee2ZH.h MEee2ZH.cc\
MEee2HiggsVBF.h MEee2HiggsVBF.cc \
MEee2VV.h MEee2VV.cc \
MEee2VectorMeson.h MEee2VectorMeson.cc
-HwMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
+HwMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0
diff --git a/MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am b/MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am
--- a/MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am
+++ b/MatrixElement/Matchbox/Builtin/Amplitudes/Makefile.am
@@ -1,53 +1,53 @@
pkglib_LTLIBRARIES = HwMatchboxBuiltin.la
-HwMatchboxBuiltin_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwMatchboxBuiltin_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwMatchboxBuiltin_la_SOURCES = \
MatchboxCurrents.h MatchboxCurrents.cc \
MatchboxZGammaAmplitude.h MatchboxZGammaAmplitude.cc \
MatchboxAmplitudellbarqqbar.cc \
MatchboxAmplitudellbarqqbarg.cc \
MatchboxAmplitudellbarqqbargg.cc \
MatchboxAmplitudellbarqqbargg.h \
MatchboxAmplitudellbarqqbarg.h \
MatchboxAmplitudellbarqqbar.h \
MatchboxAmplitudellbarqqbarqqbar.cc \
MatchboxAmplitudellbarqqbarqqbar.h \
MatchboxAmplitudelnuqqbar.cc \
MatchboxAmplitudelnuqqbarg.cc \
MatchboxAmplitudelnuqqbargg.cc \
MatchboxAmplitudelnuqqbargg.h \
MatchboxAmplitudelnuqqbarg.h \
MatchboxAmplitudelnuqqbar.h \
MatchboxAmplitudelnuqqbarqqbar.cc \
MatchboxAmplitudelnuqqbarqqbar.h \
MatchboxAmplitudehbbbar.cc \
MatchboxAmplitudehbbbarg.cc \
MatchboxAmplitudehbbbarg.h \
MatchboxAmplitudehbbbar.h \
MatchboxAmplitudehgg.cc \
MatchboxAmplitudehggg.cc \
MatchboxAmplitudehggg.h \
MatchboxAmplitudehgg.h \
MatchboxAmplitudehqqbarg.cc \
MatchboxAmplitudehqqbarg.h \
MatchboxAmplitudeqqbarttbar.cc \
MatchboxAmplitudeqqbarttbar.h \
MatchboxAmplitudeqqbarttbarg.cc \
MatchboxAmplitudeqqbarttbarg.h \
MatchboxAmplitudeggttbar.cc \
MatchboxAmplitudeggttbar.h \
MatchboxAmplitudeggttbarg.cc \
MatchboxAmplitudeggttbarg.h \
HelAmps_sm.cc \
HelAmps_sm.h \
Parameters_sm.cc \
Parameters_sm.h \
MG_qqx2ttx.cc \
MG_qqx2ttx.h \
MG_qqx2ttxg.cc \
MG_qqx2ttxg.h \
MG_gg2ttx.cc \
MG_gg2ttx.h \
MG_gg2ttxg.cc \
MG_gg2ttxg.h
diff --git a/MatrixElement/Matchbox/CVolver/Makefile.am b/MatrixElement/Matchbox/CVolver/Makefile.am
--- a/MatrixElement/Matchbox/CVolver/Makefile.am
+++ b/MatrixElement/Matchbox/CVolver/Makefile.am
@@ -1,10 +1,9 @@
pkglib_LTLIBRARIES = HwCVolver.la
-HwCVolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwCVolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwCVolver_la_SOURCES = \
ColourFlowBasis.cc \
ColourFlows.cc \
ColourFlowBasis.h \
ColourFlows.h
-
diff --git a/MatrixElement/Matchbox/ColorFull/Makefile.am b/MatrixElement/Matchbox/ColorFull/Makefile.am
--- a/MatrixElement/Matchbox/ColorFull/Makefile.am
+++ b/MatrixElement/Matchbox/ColorFull/Makefile.am
@@ -1,35 +1,35 @@
pkglib_LTLIBRARIES = HwColorFull.la
-HwColorFull_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwColorFull_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwColorFull_la_SOURCES = \
Col_amp.cc \
Col_amp.h \
Col_basis.cc \
Col_basis.h \
Col_functions.cc \
Col_functions.h \
Col_str.cc \
Col_str.h \
Monomial.cc \
Monomial.h \
Orthogonal_basis.cc \
Orthogonal_basis.h \
parameters.h \
Poly_matr.cc \
Poly_matr.h \
Polynomial.cc \
Polynomial.h \
Poly_vec.cc \
Poly_vec.h \
Quark_line.cc \
Quark_line.h \
Trace_basis.cc \
TraceBasis.cc \
Trace_basis.h \
TraceBasis.h \
Trace_type_basis.cc \
Trace_type_basis.h \
Tree_level_gluon_basis.cc \
Tree_level_gluon_basis.h \
types.h
diff --git a/MatrixElement/Matchbox/Cuts/Makefile.am b/MatrixElement/Matchbox/Cuts/Makefile.am
--- a/MatrixElement/Matchbox/Cuts/Makefile.am
+++ b/MatrixElement/Matchbox/Cuts/Makefile.am
@@ -1,20 +1,19 @@
pkglib_LTLIBRARIES = HwMatchboxCuts.la
-HwMatchboxCuts_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwMatchboxCuts_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwMatchboxCuts_la_SOURCES = \
IdentifiedParticleCut.cc \
IdentifiedParticleCut.h \
MatchboxDeltaRCut.cc \
MatchboxDeltaRCut.h \
MissingPtCut.cc \
MissingPtCut.h \
FrixionePhotonSeparationCut.cc \
FrixionePhotonSeparationCut.h \
InvariantMassCut.cc \
InvariantMassCut.h \
PairPtCut.cc \
PairPtCut.h \
PairRapidityCut.cc \
PairRapidityCut.h
-
diff --git a/MatrixElement/Matchbox/External/GoSam/Makefile.am b/MatrixElement/Matchbox/External/GoSam/Makefile.am
--- a/MatrixElement/Matchbox/External/GoSam/Makefile.am
+++ b/MatrixElement/Matchbox/External/GoSam/Makefile.am
@@ -1,19 +1,18 @@
pkglib_LTLIBRARIES = HwMatchboxGoSam.la
-HwMatchboxGoSam_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 11:1:0
+HwMatchboxGoSam_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 12:0:0
HwMatchboxGoSam_la_SOURCES = \
GoSamAmplitude.h GoSamAmplitude.cc
HwMatchboxGoSam_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DHERWIG_BINDIR="\"$(bindir)\"" \
-DHERWIG_PKGDATADIR="\"$(pkgdatadir)\"" \
-DGOSAM_PREFIX="\"$(GOSAMPREFIX)\""
EXTRA_DIST = gosam2herwig.py
install-exec-local:
$(install_sh_SCRIPT) $(srcdir)/gosam2herwig.py $(DESTDIR)$(bindir)/gosam2herwig
uninstall-local:
rm -f $(DESTDIR)$(bindir)/gosam2herwig
-
diff --git a/MatrixElement/Matchbox/External/MadGraph/Makefile.am b/MatrixElement/Matchbox/External/MadGraph/Makefile.am
--- a/MatrixElement/Matchbox/External/MadGraph/Makefile.am
+++ b/MatrixElement/Matchbox/External/MadGraph/Makefile.am
@@ -1,28 +1,28 @@
pkglib_LTLIBRARIES = HwMatchboxMadGraph.la
-HwMatchboxMadGraph_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwMatchboxMadGraph_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwMatchboxMadGraph_la_SOURCES = \
MadGraphAmplitude.h MadGraphAmplitude.cc
madgraphdir = ${pkgdatadir}/MadGraphInterface
INPUTFILES = \
InterfaceMadGraph.f.in \
param_card.dat.in \
param_card_heft.dat.in
dist_madgraph_DATA = $(INPUTFILES)
HwMatchboxMadGraph_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DHERWIG_BINDIR="\"$(bindir)\"" \
-DHERWIG_INCLUDEDIR="\"$(includedir)\"" \
-DHERWIG_PKGDATADIR="\"$(pkgdatadir)\"" \
-DMADGRAPH_PREFIX="\"$(MADGRAPHPREFIX)\""
EXTRA_DIST = mg2herwig.py
install-exec-local:
$(install_sh_SCRIPT) $(builddir)/mg2herwig.py $(DESTDIR)$(bindir)/mg2herwig
uninstall-local:
rm -f $(DESTDIR)$(bindir)/mg2herwig
diff --git a/MatrixElement/Matchbox/External/NJet/Makefile.am b/MatrixElement/Matchbox/External/NJet/Makefile.am
--- a/MatrixElement/Matchbox/External/NJet/Makefile.am
+++ b/MatrixElement/Matchbox/External/NJet/Makefile.am
@@ -1,9 +1,9 @@
pkglib_LTLIBRARIES = HwMatchboxNJet.la
-HwMatchboxNJet_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 11:1:0
+HwMatchboxNJet_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 12:0:0
HwMatchboxNJet_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(NJETINCLUDEPATH) \
-DNJET_PREFIX="\"$(NJETPREFIX)\"" \
-DNJET_LIBS="\"$(NJETLIBPATH)\""
HwMatchboxNJet_la_SOURCES = \
NJetsAmplitude.h NJetsAmplitude.cc
diff --git a/MatrixElement/Matchbox/External/OpenLoops/Makefile.am b/MatrixElement/Matchbox/External/OpenLoops/Makefile.am
--- a/MatrixElement/Matchbox/External/OpenLoops/Makefile.am
+++ b/MatrixElement/Matchbox/External/OpenLoops/Makefile.am
@@ -1,12 +1,8 @@
pkglib_LTLIBRARIES = HwMatchboxOpenLoops.la
HwMatchboxOpenLoops_la_SOURCES = \
OpenLoopsAmplitude.h OpenLoopsAmplitude.cc
-HwMatchboxOpenLoops_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 11:1:0
+HwMatchboxOpenLoops_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 12:0:0
HwMatchboxOpenLoops_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DOPENLOOPSLIBS="\"$(OPENLOOPSLIBS)\"" \
-DOPENLOOPSPREFIX="\"$(OPENLOOPSPREFIX)\""
-
-
-
-
diff --git a/MatrixElement/Matchbox/External/VBFNLO/Makefile.am b/MatrixElement/Matchbox/External/VBFNLO/Makefile.am
--- a/MatrixElement/Matchbox/External/VBFNLO/Makefile.am
+++ b/MatrixElement/Matchbox/External/VBFNLO/Makefile.am
@@ -1,16 +1,16 @@
pkglib_LTLIBRARIES = HwMatchboxVBFNLO.la
-HwMatchboxVBFNLO_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwMatchboxVBFNLO_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwMatchboxVBFNLO_la_CPPFLAGS = $(AM_CPPFLAGS)
HwMatchboxVBFNLO_la_CPPFLAGS += -I$(VBFNLOINCLUDE)
HwMatchboxVBFNLO_la_CPPFLAGS += -DVBFNLOLIB=$(VBFNLOLIB)
#HwMatchboxVBFNLO_la_LIBADD = \
#-L$(VBFNLOLIBS) \
#-lVBFNLO -lVBFNLOAmplitudes -lVBFNLOUtilities -lVBFNLOLoops \
-#-lHELAS -lVBFNLOPDFsets -lVBFNLOPhasespace -lVBFspecific -lgfortran
+#-lHELAS -lVBFNLOPDFsets -lVBFNLOPhasespace -lVBFspecific -lgfortran
HwMatchboxVBFNLO_la_SOURCES = \
VBFNLOAmplitude.h VBFNLOAmplitude.cc \
VBFNLOPhasespace.h VBFNLOPhasespace.cc
diff --git a/MatrixElement/Matchbox/Matching/Makefile.am b/MatrixElement/Matchbox/Matching/Makefile.am
--- a/MatrixElement/Matchbox/Matching/Makefile.am
+++ b/MatrixElement/Matchbox/Matching/Makefile.am
@@ -1,24 +1,24 @@
noinst_LTLIBRARIES = libHwMatchboxMatching.la
pkglib_LTLIBRARIES = HwQTildeMatching.la HwDipoleMatching.la
libHwMatchboxMatching_la_SOURCES = \
HardScaleProfile.h \
HardScaleProfile.cc \
ShowerApproximation.h \
ShowerApproximation.cc \
ShowerApproximationKernel.h \
ShowerApproximationKernel.cc \
ShowerApproximationGenerator.h \
ShowerApproximationGenerator.cc \
MEMatching.h \
MEMatching.cc
-HwQTildeMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwQTildeMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwQTildeMatching_la_SOURCES = \
QTildeMatching.h \
QTildeMatching.cc
-HwDipoleMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwDipoleMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwDipoleMatching_la_SOURCES = \
DipoleMatching.h \
DipoleMatching.cc
diff --git a/MatrixElement/Matchbox/Scales/Makefile.am b/MatrixElement/Matchbox/Scales/Makefile.am
--- a/MatrixElement/Matchbox/Scales/Makefile.am
+++ b/MatrixElement/Matchbox/Scales/Makefile.am
@@ -1,30 +1,30 @@
pkglib_LTLIBRARIES = HwMatchboxScales.la
-HwMatchboxScales_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwMatchboxScales_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwMatchboxScales_la_SOURCES = \
MatchboxHtScale.h \
MatchboxLeptonMassScale.h \
MatchboxLeptonPtScale.h \
MatchboxParticlePtScale.h \
MatchboxPtScale.h \
MatchboxHtScale.cc \
MatchboxLeptonMassScale.cc \
MatchboxLeptonPtScale.cc \
MatchboxParticlePtScale.cc \
MatchboxPtScale.cc\
MatchboxScale.h \
MatchboxScale.cc \
MatchboxSHatScale.h \
MatchboxSHatScale.cc \
MatchboxTopMassScale.h \
MatchboxTopMassScale.cc \
MatchboxTopMTScale.h \
MatchboxTopMTScale.cc \
MatchboxTopSumMTScale.h \
MatchboxTopSumMTScale.cc \
MatchboxTopMinMTScale.h \
MatchboxTopMinMTScale.cc \
MatchboxTriVecScales.h \
MatchboxTriVecScales.cc
diff --git a/Models/ADD/Makefile.am b/Models/ADD/Makefile.am
--- a/Models/ADD/Makefile.am
+++ b/Models/ADD/Makefile.am
@@ -1,13 +1,13 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwADDModel.la
endif
HwADDModel_la_SOURCES = ADDModel.fh ADDModel.cc ADDModel.h \
ADDModelFFGRVertex.cc ADDModelFFGRVertex.h \
ADDModelFFGGRVertex.cc ADDModelFFGGRVertex.h \
ADDModelFFWGRVertex.cc ADDModelFFWGRVertex.h \
ADDModelSSGRVertex.cc ADDModelSSGRVertex.h \
ADDModelVVGRVertex.cc ADDModelVVGRVertex.h \
ADDModelGGGGRVertex.cc ADDModelGGGGRVertex.h \
ADDModelWWWGRVertex.cc ADDModelWWWGRVertex.h \
GravitonMassGenerator.h GravitonMassGenerator.cc
-HwADDModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
+HwADDModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
diff --git a/Models/LH/Makefile.am b/Models/LH/Makefile.am
--- a/Models/LH/Makefile.am
+++ b/Models/LH/Makefile.am
@@ -1,16 +1,16 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwLHModel.la
endif
HwLHModel_la_SOURCES = \
LHModel.h LHModel.fh LHModel.cc \
LHFFZVertex.h LHFFZVertex.cc \
LHFFPVertex.h LHFFPVertex.cc \
LHFFGVertex.h LHFFGVertex.cc \
LHFFWVertex.h LHFFWVertex.cc \
LHWWWVertex.h LHWWWVertex.cc \
LHWWWWVertex.h LHWWWWVertex.cc \
LHFFHVertex.h LHFFHVertex.cc \
LHWWHVertex.h LHWWHVertex.cc \
LHWHHVertex.h LHWHHVertex.cc \
-LHWWHHVertex.h LHWWHHVertex.cc
-HwLHModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:1:0
+LHWWHHVertex.h LHWWHHVertex.cc
+HwLHModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
diff --git a/Models/LHTP/Makefile.am b/Models/LHTP/Makefile.am
--- a/Models/LHTP/Makefile.am
+++ b/Models/LHTP/Makefile.am
@@ -1,17 +1,17 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwLHTPModel.la
endif
HwLHTPModel_la_SOURCES = \
LHTPModel.fh LHTPModel.cc LHTPModel.h \
LHTPWWHVertex.cc LHTPWWHVertex.h \
LHTPFFGVertex.cc LHTPFFGVertex.h \
LHTPFFPVertex.cc LHTPFFPVertex.h \
LHTPFFWVertex.cc LHTPFFWVertex.h \
LHTPFFZVertex.cc LHTPFFZVertex.h \
LHTPWWWVertex.cc LHTPWWWVertex.h \
LHTPHHHVertex.cc LHTPHHHVertex.h \
LHTPWHHVertex.cc LHTPWHHVertex.h \
LHTPFFHVertex.cc LHTPFFHVertex.h
-HwLHTPModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:1:0
+HwLHTPModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
HwLHTPModel_la_LIBADD= $(GSLLIBS)
HwLHTPModel_la_CPPFLAGS= $(AM_CPPFLAGS) $(GSLINCLUDE)
diff --git a/Models/Leptoquarks/Makefile.am b/Models/Leptoquarks/Makefile.am
--- a/Models/Leptoquarks/Makefile.am
+++ b/Models/Leptoquarks/Makefile.am
@@ -1,10 +1,10 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwLeptoquarkModel.la
endif
HwLeptoquarkModel_la_SOURCES = \
LeptoquarkModel.cc LeptoquarkModel.h LeptoquarkModel.fh \
LeptoquarkModelSLQSLQGGVertex.h LeptoquarkModelSLQSLQGGVertex.cc \
LeptoquarkModelSLQFFVertex.h LeptoquarkModelSLQFFVertex.cc \
-LeptoquarkModelSLQSLQGVertex.h LeptoquarkModelSLQSLQGVertex.cc
+LeptoquarkModelSLQSLQGVertex.h LeptoquarkModelSLQSLQGVertex.cc
-HwLeptoquarkModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:1
+HwLeptoquarkModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
diff --git a/Models/RSModel/Makefile.am b/Models/RSModel/Makefile.am
--- a/Models/RSModel/Makefile.am
+++ b/Models/RSModel/Makefile.am
@@ -1,12 +1,12 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwRSModel.la
endif
HwRSModel_la_SOURCES = RSModel.fh RSModel.cc RSModel.h \
RSModelFFGRVertex.cc RSModelFFGRVertex.h \
RSModelFFGGRVertex.cc RSModelFFGGRVertex.h \
RSModelFFWGRVertex.cc RSModelFFWGRVertex.h \
RSModelSSGRVertex.cc RSModelSSGRVertex.h \
RSModelVVGRVertex.cc RSModelVVGRVertex.h \
RSModelWWWGRVertex.cc RSModelWWWGRVertex.h\
-RSModelGGGGRVertex.cc RSModelGGGGRVertex.h
-HwRSModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+RSModelGGGGRVertex.cc RSModelGGGGRVertex.h
+HwRSModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
diff --git a/Models/Sextet/Makefile.am b/Models/Sextet/Makefile.am
--- a/Models/Sextet/Makefile.am
+++ b/Models/Sextet/Makefile.am
@@ -1,13 +1,13 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwSextetModel.la
endif
HwSextetModel_la_SOURCES = SextetParticles.h \
SextetModel.cc SextetModel.h SextetModel.fh \
SextetGSSVertex.cc SextetGSSVertex.h \
SextetGGSSVertex.cc SextetGGSSVertex.h \
SextetGVVVertex.cc SextetGVVVertex.h \
SextetGGVVVertex.cc SextetGGVVVertex.h \
SextetFFSVertex.cc SextetFFSVertex.h \
-SextetFFVVertex.cc SextetFFVVertex.h
+SextetFFVVertex.cc SextetFFVVertex.h
-HwSextetModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:1:0
+HwSextetModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
diff --git a/Models/Susy/Makefile.am b/Models/Susy/Makefile.am
--- a/Models/Susy/Makefile.am
+++ b/Models/Susy/Makefile.am
@@ -1,34 +1,34 @@
SUBDIRS = NMSSM RPV
if WANT_BSM
pkglib_LTLIBRARIES = HwSusy.la
endif
HwSusy_la_SOURCES = SusyBase.cc SusyBase.h SusyBase.fh \
MSSM.cc MSSM.h MSSM.fh\
MixingMatrix.h MixingMatrix.fh MixingMatrix.cc\
SSCFSVertex.cc SSCFSVertex.h \
SSGFSVertex.cc SSGFSVertex.h \
SSHSFSFVertex.cc SSHSFSFVertex.h \
SSNFSVertex.cc SSNFSVertex.h \
SSWSSVertex.cc SSWSSVertex.h \
SSWGSSVertex.cc SSWGSSVertex.h \
SSGSSVertex.cc SSGSSVertex.h \
SSGGSQSQVertex.cc SSGGSQSQVertex.h \
SSGSGSGVertex.cc SSGSGSGVertex.h \
SSNNZVertex.cc SSNNZVertex.h \
SSCCZVertex.cc SSCCZVertex.h \
SSCNWVertex.cc SSCNWVertex.h \
SSFFHVertex.cc SSFFHVertex.h \
SSGOGOHVertex.cc SSGOGOHVertex.h \
SSWWHVertex.cc SSWWHVertex.h \
SSWWHHVertex.cc SSWWHHVertex.h \
SSWHHVertex.cc SSWHHVertex.h \
SSHHHVertex.cc SSHHHVertex.h \
SSHGGVertex.cc SSHGGVertex.h \
SSHPPVertex.cc SSHPPVertex.h \
SSNNPVertex.h SSNNPVertex.cc \
SSGNGVertex.h SSGNGVertex.cc \
SSNCTVertex.h SSNCTVertex.cc \
SSGVNHVertex.h SSGVNHVertex.cc\
SSGVNVVertex.h SSGVNVVertex.cc\
SSGVFSVertex.h SSGVFSVertex.cc
-HwSusy_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 10:0:0
+HwSusy_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 11:0:0
diff --git a/Models/Susy/NMSSM/Makefile.am b/Models/Susy/NMSSM/Makefile.am
--- a/Models/Susy/NMSSM/Makefile.am
+++ b/Models/Susy/NMSSM/Makefile.am
@@ -1,15 +1,15 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwNMSSM.la
endif
HwNMSSM_la_SOURCES = \
NMSSM.cc NMSSM.h NMSSM.fh \
NMSSMFFHVertex.h NMSSMFFHVertex.cc \
NMSSMWWHVertex.h NMSSMWWHVertex.cc \
NMSSMWHHVertex.h NMSSMWHHVertex.cc \
NMSSMHSFSFVertex.h NMSSMHSFSFVertex.cc\
NMSSMGOGOHVertex.h NMSSMGOGOHVertex.cc \
NMSSMHHHVertex.h NMSSMHHHVertex.cc \
NMSSMGGHVertex.h NMSSMGGHVertex.cc \
NMSSMPPHVertex.h NMSSMPPHVertex.cc \
-NMSSMWWHHVertex.h NMSSMWWHHVertex.cc
-HwNMSSM_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
+NMSSMWWHHVertex.h NMSSMWWHHVertex.cc
+HwNMSSM_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
diff --git a/Models/Susy/RPV/Makefile.am b/Models/Susy/RPV/Makefile.am
--- a/Models/Susy/RPV/Makefile.am
+++ b/Models/Susy/RPV/Makefile.am
@@ -1,15 +1,15 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwRPV.la
endif
HwRPV_la_SOURCES = \
RPV.cc RPV.h RPV.fh \
RPVLLEVertex.h RPVLLEVertex.cc\
RPVLQDVertex.h RPVLQDVertex.cc\
RPVUDDVertex.h RPVUDDVertex.cc\
RPVFFZVertex.h RPVFFZVertex.cc\
RPVFFWVertex.h RPVFFWVertex.cc\
RPVWSSVertex.h RPVWSSVertex.cc\
RPVFFSVertex.h RPVFFSVertex.cc\
RPVWWHVertex.h RPVWWHVertex.cc\
RPVSSSVertex.h RPVSSSVertex.cc
-HwRPV_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwRPV_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
diff --git a/Models/TTbAsymm/Makefile.am b/Models/TTbAsymm/Makefile.am
--- a/Models/TTbAsymm/Makefile.am
+++ b/Models/TTbAsymm/Makefile.am
@@ -1,11 +1,11 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwTTbAModel.la
endif
HwTTbAModel_la_SOURCES = \
TTbAModel.cc TTbAModel.h TTbAModel.fh \
TTbAModelWPTDVertex.h TTbAModelWPTDVertex.cc \
TTbAModelZPQQVertex.h TTbAModelZPQQVertex.cc \
TTbAModelAGQQVertex.h TTbAModelAGQQVertex.cc \
-TTbAModelSU2XVertex.h TTbAModelSU2XVertex.cc
+TTbAModelSU2XVertex.h TTbAModelSU2XVertex.cc
-HwTTbAModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwTTbAModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
diff --git a/Models/Transplanckian/Makefile.am b/Models/Transplanckian/Makefile.am
--- a/Models/Transplanckian/Makefile.am
+++ b/Models/Transplanckian/Makefile.am
@@ -1,5 +1,5 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwTransplanck.la
endif
HwTransplanck_la_SOURCES = METRP2to2.cc METRP2to2.h
-HwTransplanck_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
+HwTransplanck_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
diff --git a/Models/UED/Makefile.am b/Models/UED/Makefile.am
--- a/Models/UED/Makefile.am
+++ b/Models/UED/Makefile.am
@@ -1,20 +1,20 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwUED.la
endif
HwUED_la_SOURCES = \
UEDBase.cc UEDBase.h UEDBase.fh \
UEDF1F1Z0Vertex.cc UEDF1F1Z0Vertex.h \
UEDF1F1G0Vertex.cc UEDF1F1G0Vertex.h \
UEDF1F0G1Vertex.cc UEDF1F0G1Vertex.h \
UEDG1G1G0Vertex.cc UEDG1G1G0Vertex.h \
UEDG0G0G1G1Vertex.cc UEDG0G0G1G1Vertex.h \
UEDF1F1P0Vertex.cc UEDF1F1P0Vertex.h \
UEDF1F1W0Vertex.cc UEDF1F1W0Vertex.h \
UEDF1F0W1Vertex.cc UEDF1F0W1Vertex.h \
UEDP0H1H1Vertex.cc UEDP0H1H1Vertex.h \
UEDZ0H1H1Vertex.cc UEDZ0H1H1Vertex.h \
UEDW0A1H1Vertex.cc UEDW0A1H1Vertex.h \
UEDZ0A1h1Vertex.cc UEDZ0A1h1Vertex.h \
UEDW0W1W1Vertex.cc UEDW0W1W1Vertex.h \
UEDF1F0H1Vertex.cc UEDF1F0H1Vertex.h
-HwUED_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
+HwUED_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0
diff --git a/Models/Zprime/Makefile.am b/Models/Zprime/Makefile.am
--- a/Models/Zprime/Makefile.am
+++ b/Models/Zprime/Makefile.am
@@ -1,6 +1,6 @@
if WANT_BSM
pkglib_LTLIBRARIES = HwZprimeModel.la
endif
-HwZprimeModel_la_SOURCES = ZprimeModel.cc ZprimeModel.h ZprimeModel.fh ZprimeModelZPQQVertex.h ZprimeModelZPQQVertex.cc
+HwZprimeModel_la_SOURCES = ZprimeModel.cc ZprimeModel.h ZprimeModel.fh ZprimeModelZPQQVertex.h ZprimeModelZPQQVertex.cc
-HwZprimeModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwZprimeModel_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
diff --git a/PDF/Makefile.am b/PDF/Makefile.am
--- a/PDF/Makefile.am
+++ b/PDF/Makefile.am
@@ -1,70 +1,70 @@
pkglib_LTLIBRARIES = HwMRST.la
HwMRST_la_SOURCES = \
-MRST.cc MRST.h MRST.icc
+MRST.cc MRST.h MRST.icc
## add this to produce tests of the PDFs
## HwMRST_la_CPPFLAGS=$(AM_CPPFLAGS) -DMRST_TESTING
-HwMRST_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:1:0
+HwMRST_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0
EXTRA_DIST = mrst diffraction
pkglib_LTLIBRARIES += HwPomeronPDF.la
HwPomeronPDF_la_SOURCES = \
-PomeronPDF.cc PomeronPDF.h
+PomeronPDF.cc PomeronPDF.h
## add this to produce tests of the PDFs
## HwDIFFRACTIVEPDF_la_CPPFLAGS=$(AM_CPPFLAGS) -DDIFFRACTIVEPDF_TESTING
-HwPomeronPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:1:0
+HwPomeronPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
pkglib_LTLIBRARIES += HwReggeonPDF.la
HwReggeonPDF_la_SOURCES = \
-ReggeonPDF.cc ReggeonPDF.h
+ReggeonPDF.cc ReggeonPDF.h
## add this to produce tests of the PDFs
## HwDIFFRACTIVEPDF_la_CPPFLAGS=$(AM_CPPFLAGS) -DDIFFRACTIVEPDF_TESTING
-HwReggeonPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwReggeonPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
pkglib_LTLIBRARIES += HwPomeronFlux.la
HwPomeronFlux_la_SOURCES = \
PomeronFlux.h PomeronFlux.cc
-HwPomeronFlux_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
+HwPomeronFlux_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
## bound into HwShower.la
noinst_LTLIBRARIES = libHwRemDecayer.la
libHwRemDecayer_la_SOURCES = \
HwRemDecayer.h HwRemDecayer.cc HwRemDecayer.fh
## bound into HwShower.la
noinst_LTLIBRARIES += libHwMPIPDF.la
libHwMPIPDF_la_SOURCES = \
MPIPDF.h MPIPDF.cc MPIPDF.fh \
MinBiasPDF.h MinBiasPDF.cc MinBiasPDF.fh
pkglib_LTLIBRARIES += HwSatPDF.la
HwSatPDF_la_SOURCES = \
SatPDF.h SatPDF.cc
-HwSatPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
+HwSatPDF_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
pkglib_LTLIBRARIES += HwIncomingPhotonEvolver.la
HwIncomingPhotonEvolver_la_SOURCES = \
IncomingPhotonEvolver.h IncomingPhotonEvolver.cc
-HwIncomingPhotonEvolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0
+HwIncomingPhotonEvolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0
if WANT_LOCAL_PDF
install-data-local:
for i in `find $(srcdir)/mrst -name '*.dat'`; \
do \
$(install_sh_DATA) $$i $(DESTDIR)$(pkgdatadir)/PDF/$${i#$(srcdir)/}; \
done
for i in `find $(srcdir)/diffraction -name '*.data'`; \
do \
$(install_sh_DATA) $$i $(DESTDIR)$(pkgdatadir)/PDF/$${i#$(srcdir)/}; \
done
uninstall-local:
rm -rf $(DESTDIR)$(pkgdatadir)/PDF
endif
dist-hook:
rm -rf `find $(distdir)/mrst -name '.svn' -or -name '.cvsignore' -or -name 'CVS'`
rm -rf `find $(distdir)/diffraction -name '.svn' -or -name '.cvsignore' -or -name 'CVS'`
diff --git a/Sampling/Makefile.am b/Sampling/Makefile.am
--- a/Sampling/Makefile.am
+++ b/Sampling/Makefile.am
@@ -1,41 +1,40 @@
SUBDIRS = CellGrids
pkglib_LTLIBRARIES = HwSampling.la
-HwSampling_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
+HwSampling_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
HwSampling_la_SOURCES = \
GeneralStatistics.h GeneralStatistics.cc \
MultiIterationStatistics.h MultiIterationStatistics.cc \
BinSampler.h BinSampler.cc \
GeneralSampler.h GeneralSampler.cc \
MonacoSampler.h MonacoSampler.cc \
Remapper.h Remapper.cc \
exsample/cell.icc \
exsample/generator.h \
exsample/linear_interpolator.icc \
exsample/config.h \
exsample/selectors.h \
exsample/adaption_info.h \
exsample/selectors.icc \
exsample/adaption_info.icc \
exsample/exponential_generator.h \
exsample/exponential_generator.icc \
exsample/generator.icc \
exsample/statistics.h \
exsample/linear_interpolator.h \
exsample/cell.h \
exsample/utility.h \
exsample/binary_tree.h \
exsample/statistics.icc
HwSampling_la_LIBADD = \
CellGrids/libHwCellGrids.la
EXTRA_DIST = herwig-mergegrids.py
install-exec-local:
$(install_sh_SCRIPT) $(srcdir)/herwig-mergegrids.py $(DESTDIR)$(bindir)/herwig-mergegrids
uninstall-local:
rm -f $(DESTDIR)$(bindir)/herwig-mergegrids
-
diff --git a/Shower/Makefile.am b/Shower/Makefile.am
--- a/Shower/Makefile.am
+++ b/Shower/Makefile.am
@@ -1,50 +1,50 @@
SUBDIRS = Matching .
pkglib_LTLIBRARIES = HwShower.la
-HwShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 18:0:0
+HwShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 19:0:0
HwShower_la_LIBADD = \
$(top_builddir)/PDF/libHwRemDecayer.la \
$(top_builddir)/PDF/libHwMPIPDF.la
HwShower_la_SOURCES = \
UEBase.h UEBase.cc UEBase.fh \
Couplings/ShowerAlphaQCD.h Couplings/ShowerAlphaQCD.cc \
Couplings/ShowerAlphaQED.h Couplings/ShowerAlphaQED.cc\
ShowerHandler.h ShowerHandler.fh ShowerHandler.cc \
SplittingFunctions/HalfHalfOneSplitFn.h SplittingFunctions/HalfHalfOneSplitFn.cc\
SplittingFunctions/OneOneOneSplitFn.h SplittingFunctions/OneOneOneSplitFn.cc\
SplittingFunctions/ZeroZeroOneSplitFn.h SplittingFunctions/ZeroZeroOneSplitFn.cc\
SplittingFunctions/OneHalfHalfSplitFn.h SplittingFunctions/OneHalfHalfSplitFn.cc\
SplittingFunctions/HalfOneHalfSplitFn.h SplittingFunctions/HalfOneHalfSplitFn.cc\
Default/QTildeSudakov.cc Default/QTildeSudakov.h\
Default/QTildeModel.cc Default/QTildeModel.h\
Default/Decay_QTildeShowerKinematics1to2.cc \
Default/Decay_QTildeShowerKinematics1to2.h \
Default/IS_QTildeShowerKinematics1to2.cc Default/IS_QTildeShowerKinematics1to2.h \
Default/FS_QTildeShowerKinematics1to2.cc Default/FS_QTildeShowerKinematics1to2.h \
Default/QTildeShowerKinematics1to2.cc Default/QTildeShowerKinematics1to2.fh\
Default/QTildeShowerKinematics1to2.h \
Default/QTildeFinder.cc Default/QTildeFinder.h\
Default/QTildeReconstructor.cc Default/QTildeReconstructor.h Default/QTildeReconstructor.tcc \
Base/KinematicsReconstructor.cc \
Base/KinematicsReconstructor.h \
Base/KinematicsReconstructor.fh \
Base/ShowerModel.cc Base/ShowerModel.h Base/ShowerModel.fh \
Base/PartnerFinder.h Base/PartnerFinder.fh Base/PartnerFinder.cc \
Base/Evolver.h Base/Evolver.fh Base/Evolver.cc \
Base/ShowerVeto.h Base/ShowerVeto.fh Base/ShowerVeto.cc
noinst_LTLIBRARIES = libHwShower.la
libHwShower_la_SOURCES = ShowerConfig.h \
Base/Branching.h \
Base/ShowerParticle.cc Base/ShowerParticle.fh Base/ShowerParticle.h \
Base/ShowerKinematics.fh Base/ShowerKinematics.h Base/ShowerKinematics.cc \
Base/ShowerTree.h Base/ShowerTree.fh Base/ShowerTree.cc \
Base/ShowerProgenitor.fh Base/ShowerProgenitor.h \
Base/HardTree.h Base/HardTree.fh Base/HardTree.cc\
Base/SudakovFormFactor.cc Base/SudakovFormFactor.h Base/SudakovFormFactor.fh \
Base/HardBranching.h Base/HardBranching.fh Base/HardBranching.cc\
Couplings/ShowerAlpha.h Couplings/ShowerAlpha.cc Couplings/ShowerAlpha.fh\
SplittingFunctions/SplittingGenerator.cc SplittingFunctions/SplittingGenerator.h\
SplittingFunctions/SplittingGenerator.fh \
SplittingFunctions/SplittingFunction.h SplittingFunctions/SplittingFunction.fh \
SplittingFunctions/SplittingFunction.cc \
Base/ShowerVertex.cc Base/ShowerVertex.fh Base/ShowerVertex.h
diff --git a/Shower/Matching/Makefile.am b/Shower/Matching/Makefile.am
--- a/Shower/Matching/Makefile.am
+++ b/Shower/Matching/Makefile.am
@@ -1,8 +1,8 @@
pkglib_LTLIBRARIES = HwMatching.la
-HwMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0
+HwMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0
HwMatching_la_SOURCES = \
PowhegShowerHandler.h PowhegShowerHandler.cc \
CKKWTree.h CKKWTree.fh CKKWTree.cc \
-ProtoTree.h ProtoBranching.h PotentialTree.h
+ProtoTree.h ProtoBranching.h PotentialTree.h
diff --git a/UnderlyingEvent/Makefile.am b/UnderlyingEvent/Makefile.am
--- a/UnderlyingEvent/Makefile.am
+++ b/UnderlyingEvent/Makefile.am
@@ -1,15 +1,15 @@
pkglib_LTLIBRARIES = HwUA5.la
HwUA5_la_SOURCES = UA5Handler.cc UA5Handler.h UA5Handler.icc
HwUA5_la_LDFLAGS= $(AM_LDFLAGS) -module -version-info 5:1:0
pkglib_LTLIBRARIES += HwMPI.la
HwMPI_la_SOURCES = MPISampler.cc MPISampler.h MPISampler.icc \
MPISampler.fh MPIHandler.cc \
MPIHandler.fh MPIHandler.h \
ProcessHandler.cc ProcessHandler.icc \
ProcessHandler.fh ProcessHandler.h \
MPIXSecReweighter.h MPIXSecReweighter.cc \
stat.h
-HwMPI_la_LDFLAGS= $(AM_LDFLAGS) -module -version-info 12:0:0
+HwMPI_la_LDFLAGS= $(AM_LDFLAGS) -module -version-info 13:0:0
HwMPI_la_LIBADD= $(GSLLIBS)
HwMPI_la_CPPFLAGS= $(AM_CPPFLAGS) $(GSLINCLUDE)
diff --git a/Utilities/Makefile.am b/Utilities/Makefile.am
--- a/Utilities/Makefile.am
+++ b/Utilities/Makefile.am
@@ -1,37 +1,38 @@
SUBDIRS = XML Statistics
-noinst_LTLIBRARIES = libHwUtils.la
+noinst_LTLIBRARIES = libHwUtils.la
pkglib_LTLIBRARIES = libHwRunDirectories.la
libHwUtils_la_SOURCES = \
EnumParticles.h \
Interpolator.tcc Interpolator.h \
Kinematics.cc Kinematics.h \
Maths.h Maths.cc \
StandardSelectors.cc StandardSelectors.h\
Histogram.cc Histogram.fh Histogram.h \
GaussianIntegrator.cc GaussianIntegrator.h \
GaussianIntegrator.tcc \
Statistic.h HerwigStrategy.cc HerwigStrategy.h \
GSLIntegrator.h GSLIntegrator.tcc \
GSLBisection.h GSLBisection.tcc GSLHelper.h
libHwRunDirectories_la_SOURCES = \
RunDirectories.h RunDirectories.cc
+libHwRunDirectories_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
libHwUtils_la_LIBADD = \
XML/libHwXML.la \
Statistics/libHwStatistics.la
CLEANFILES=
include $(srcdir)/Makefile.am.versionstring
check_PROGRAMS = utilities_test
utilities_test_SOURCES = \
tests/utilitiesTestsMain.cc \
tests/utilitiesTestsGlobalFixture.h \
tests/utilitiesTestsKinematics.h \
tests/utilitiesTestMaths.h \
tests/utilitiesTestsStatistic.h
utilities_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(THEPEGLIB) -ldl libHwUtils.la
utilities_test_LDFLAGS = $(AM_LDFLAGS) -export-dynamic $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(THEPEGLDFLAGS)
utilities_test_CPPFLAGS = $(AM_CPPFLAGS) $(BOOST_CPPFLAGS) -DHERWIG_PKGDATADIR="\"$(pkgdatadir)\"" -DHERWIG_PKGLIBDIR="\"$(pkglibdir)\"" -DTHEPEG_PKGLIBDIR="\"$(THEPEGLIBPATH)\""
TESTS = utilities_test
diff --git a/lib/Makefile.am b/lib/Makefile.am
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,49 +1,49 @@
pkglib_LTLIBRARIES = Herwig.la
Herwig_la_SOURCES =
Herwig_la_LIBTOOLFLAGS = --tag=CXX
-Herwig_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 15:0:0
-Herwig_la_LDFLAGS += $(THEPEGLDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(FCLIBS)
+Herwig_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 16:0:0
+Herwig_la_LDFLAGS += $(THEPEGLDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(FCLIBS)
Herwig_la_LIBADD = \
$(top_builddir)/Hadronization/libHwHadronization.la \
$(top_builddir)/Models/StandardModel/libHwStandardModel.la \
$(top_builddir)/Decay/libHwDecay.la \
$(top_builddir)/Decay/FormFactors/libHwFormFactor.la \
$(top_builddir)/Decay/Radiation/libHwDecRad.la \
$(top_builddir)/Utilities/libHwUtils.la \
$(top_builddir)/Models/General/libHwModelGenerator.la \
$(top_builddir)/Decay/General/libHwGeneralDecay.la \
$(top_builddir)/MatrixElement/General/libHwGeneralME.la \
$(top_builddir)/MatrixElement/libHwME.la \
$(top_builddir)/MatrixElement/Reweighters/libHwReweighters.la \
$(top_builddir)/MatrixElement/Matchbox/libHwMatchbox.la \
$(top_builddir)/Decay/WeakCurrents/libHwWeakCurrent.la \
$(top_builddir)/Looptools/libHwLooptools.la \
$(top_builddir)/Shower/libHwShower.la \
$(THEPEGLIB) $(BOOST_SYSTEM_LIBS) $(BOOST_FILESYSTEM_LIBS) -ldl
dist_noinst_SCRIPTS = fix-osx-path
POSTPROCESSING = done-all-links
if NEED_APPLE_FIXES
POSTPROCESSING += apple-fixes
endif
all-local: $(POSTPROCESSING)
done-all-links: Herwig.la
find $(top_builddir) \( -name '*.so.*' -or -name '*.so' \) \
-not -name 'lib*' -not -path '$(top_builddir)/lib/*' \
-not -path '$(top_builddir)/.hg/*' -exec $(LN_S) -f \{\} \;
$(LN_S) -f .libs/Herwig*so* .
echo "stamp" > $@
apple-fixes: fix-osx-path done-all-links
./$<
echo "stamp" > $@
clean-local:
rm -f *.so *.so.* done-all-links apple-fixes
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Sun, Feb 23, 2:49 PM (1 d, 7 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4477377
Default Alt Text
(50 KB)
Attached To
R563 testingHerwigHG
Event Timeline
Log In to Comment