diff --git a/Decay/Makefile.am b/Decay/Makefile.am --- a/Decay/Makefile.am +++ b/Decay/Makefile.am @@ -1,236 +1,235 @@ SUBDIRS = FormFactors Tau Baryon VectorMeson Perturbative \ WeakCurrents ScalarMeson TensorMeson Partonic General Radiation if HAVE_EVTGEN SUBDIRS += EvtGen endif noinst_LTLIBRARIES = libHwDecay.la libHwDecay_la_LIBADD = \ $(top_builddir)/PDT/libHwPDT.la nodist_libHwDecay_la_SOURCES = \ hwdecay__all.cc BUILT_SOURCES = hwdecay__all.cc CLEANFILES = hwdecay__all.cc hwdecay__all.cc : $(DIR_H_FILES) $(DIR_CC_FILES) Makefile @echo "Concatenating .cc files into $@" @$(top_srcdir)/cat_with_cpplines $(DIR_CC_FILES) > $@ EXTRA_DIST = $(ALL_H_FILES) $(ALL_CC_FILES) DIR_H_FILES = $(addprefix $(srcdir)/,$(ALL_H_FILES)) ALL_H_FILES = \ DecayIntegrator.fh DecayIntegrator.h \ DecayPhaseSpaceChannel.fh DecayPhaseSpaceChannel.h \ DecayPhaseSpaceMode.fh DecayPhaseSpaceMode.h \ HwDecayerBase.fh HwDecayerBase.h \ HwDecayHandler.h \ DecayVertex.fh DecayVertex.h \ DecayMatrixElement.fh DecayMatrixElement.h \ TwoBodyDecayMatrixElement.h \ GeneralDecayMatrixElement.fh GeneralDecayMatrixElement.h \ BranchingRatioReweighter.h\ PerturbativeDecayer.h DIR_CC_FILES = $(addprefix $(srcdir)/,$(ALL_CC_FILES)) ALL_CC_FILES = \ DecayIntegrator.cc \ DecayPhaseSpaceChannel.cc \ DecayPhaseSpaceMode.cc \ HwDecayerBase.cc \ HwDecayHandler.cc \ DecayVertex.cc \ DecayMatrixElement.cc \ TwoBodyDecayMatrixElement.cc \ GeneralDecayMatrixElement.cc \ BranchingRatioReweighter.cc\ PerturbativeDecayer.cc ################## pkglib_LTLIBRARIES = Hw64Decay.la Hw64Decay_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 10:0:0 +$(AM_LDFLAGS) -module -version-info 11:0:0 Hw64Decay_la_SOURCES = \ Hw64Decayer.h Hw64Decayer.cc ################## pkglib_LTLIBRARIES += HwMamboDecay.la HwMamboDecay_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 11:0:0 +$(AM_LDFLAGS) -module -version-info 12:0:0 HwMamboDecay_la_SOURCES = \ MamboDecayer.h MamboDecayer.cc ################## noinst_LTLIBRARIES += libHwFormFactor.la libHwFormFactor_la_SOURCES = \ FormFactors/BaryonFormFactor.cc \ FormFactors/ScalarFormFactor.cc \ FormFactors/BtoSGammaHadronicMass.cc \ FormFactors/BaryonFormFactor.fh \ FormFactors/BaryonFormFactor.h \ FormFactors/ScalarFormFactor.fh \ FormFactors/ScalarFormFactor.h \ FormFactors/BtoSGammaHadronicMass.h \ FormFactors/BtoSGammaHadronicMass.fh pkglib_LTLIBRARIES += HwFormFactors.la HwFormFactors_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 11:0:0 +$(AM_LDFLAGS) -module -version-info 12:0:0 HwFormFactors_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/FormFactors nodist_HwFormFactors_la_SOURCES = \ FormFactors/Formfactor__all.cc ################## pkglib_LTLIBRARIES += HwTauDecay.la HwTauDecay_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 11:0:0 +$(AM_LDFLAGS) -module -version-info 12:0:0 HwTauDecay_la_SOURCES = \ Tau/TauDecayer.cc ################## pkglib_LTLIBRARIES += HwBaryonDecay.la HwBaryonDecay_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 10:0:0 +$(AM_LDFLAGS) -module -version-info 11:0:0 HwBaryonDecay_la_LIBADD = \ $(top_builddir)/PDT/libHwBaryonWidth.la HwBaryonDecay_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/Baryon nodist_HwBaryonDecay_la_SOURCES = \ Baryon/BaryonDecayer__all.cc ################## pkglib_LTLIBRARIES += HwVMDecay.la HwVMDecay_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 10:0:0 +$(AM_LDFLAGS) -module -version-info 11:0:0 HwVMDecay_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/VectorMeson nodist_HwVMDecay_la_SOURCES = \ VectorMeson/VMDecayer__all.cc ################## pkglib_LTLIBRARIES += HwPerturbativeDecay.la HwPerturbativeDecay_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 11:0:0 +$(AM_LDFLAGS) -module -version-info 12:0:0 HwPerturbativeDecay_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/Perturbative nodist_HwPerturbativeDecay_la_SOURCES = \ Perturbative/Perturbative__all.cc ################## noinst_LTLIBRARIES += libHwWeakCurrent.la libHwWeakCurrent_la_SOURCES = \ WeakCurrents/WeakDecayCurrent.cc \ WeakCurrents/LeptonNeutrinoCurrent.cc \ WeakCurrents/WeakDecayCurrent.fh \ WeakCurrents/WeakDecayCurrent.h \ WeakCurrents/LeptonNeutrinoCurrent.fh \ WeakCurrents/LeptonNeutrinoCurrent.h pkglib_LTLIBRARIES += HwWeakCurrents.la HwWeakCurrents_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 11:0:0 +$(AM_LDFLAGS) -module -version-info 12:0:0 HwWeakCurrents_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/WeakCurrents nodist_HwWeakCurrents_la_SOURCES = \ WeakCurrents/WeakCurrents__all.cc ################## pkglib_LTLIBRARIES += HwSMDecay.la HwSMDecay_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 12:0:0 +$(AM_LDFLAGS) -module -version-info 13:0:0 HwSMDecay_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/ScalarMeson nodist_HwSMDecay_la_SOURCES = \ ScalarMeson/SMDecayer__all.cc ################## pkglib_LTLIBRARIES += HwTMDecay.la HwTMDecay_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 10:0:0 +$(AM_LDFLAGS) -module -version-info 11:0:0 HwTMDecay_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/TensorMeson nodist_HwTMDecay_la_SOURCES = \ TensorMeson/TMDecayer__all.cc ################## pkglib_LTLIBRARIES += HwPartonicDecay.la HwPartonicDecay_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 11:0:0 +$(AM_LDFLAGS) -module -version-info 12:0:0 HwPartonicDecay_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/Partonic nodist_HwPartonicDecay_la_SOURCES = \ Partonic/Partonic__all.cc ################## noinst_LTLIBRARIES += libHwDecRad.la libHwDecRad_la_SOURCES = \ Radiation/DecayRadiationGenerator.cc \ Radiation/QEDRadiationHandler.cc \ Radiation/DecayRadiationGenerator.h \ Radiation/DecayRadiationGenerator.fh \ Radiation/QEDRadiationHandler.fh \ Radiation/QEDRadiationHandler.h pkglib_LTLIBRARIES += HwSOPHTY.la HwSOPHTY_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 5:0:0 +$(AM_LDFLAGS) -module -version-info 6:0:0 HwSOPHTY_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/Radiation nodist_HwSOPHTY_la_SOURCES = \ Radiation/Sophty__all.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 8:0:0 +HwMEDIS_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:1 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 5:0:0 +HwMEGammaGamma_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:1 HwMEGammaHadron_la_SOURCES = \ MEGammaP2Jets.cc MEGammaP2Jets.h HwMEGammaHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5: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 \ MEDiffraction.h MEDiffraction.cc -HwMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0 +HwMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 10:0:0 pkglib_LTLIBRARIES += HwMEHadronFast.la HwMEHadronFast_la_SOURCES = \ MEQCD2to2Fast.h MEQCD2to2Fast.cc HwMEHadronFast_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7: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,10 +1,10 @@ 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 \ MEee2Higgs2SM.h MEee2Higgs2SM.cc -HwMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:0 +HwMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8:0:1 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,9 +1,9 @@ pkglib_LTLIBRARIES = HwCVolver.la -HwCVolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0 +HwCVolver_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:1 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 4:0:0 +HwColorFull_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5: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/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 4:0:0 +HwQTildeMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:1 HwQTildeMatching_la_SOURCES = \ QTildeMatching.h \ QTildeMatching.cc HwDipoleMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 4:0:0 HwDipoleMatching_la_SOURCES = \ DipoleMatching.h \ DipoleMatching.cc diff --git a/MatrixElement/Powheg/Makefile.am b/MatrixElement/Powheg/Makefile.am --- a/MatrixElement/Powheg/Makefile.am +++ b/MatrixElement/Powheg/Makefile.am @@ -1,17 +1,17 @@ pkglib_LTLIBRARIES = HwPowhegMEHadron.la HwPowhegMELepton.la -HwPowhegMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:0 +HwPowhegMEHadron_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 9:0:1 HwPowhegMEHadron_la_SOURCES = \ MEqq2gZ2ffPowheg.cc MEqq2gZ2ffPowheg.h \ MEqq2W2ffPowheg.cc MEqq2W2ffPowheg.h \ MEPP2HiggsPowheg.cc MEPP2HiggsPowheg.h \ MEPP2WHPowheg.cc MEPP2WHPowheg.h \ MEPP2ZHPowheg.cc MEPP2ZHPowheg.h \ MEPP2VVPowheg.cc MEPP2VVPowheg.h \ VVKinematics.cc VVKinematics.h \ MEPP2GammaGammaPowheg.cc MEPP2GammaGammaPowheg.h \ MEPP2HiggsVBFPowheg.cc MEPP2HiggsVBFPowheg.h -HwPowhegMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0 +HwPowhegMELepton_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:1 HwPowhegMELepton_la_SOURCES = \ MEee2gZ2qqPowheg.cc MEee2gZ2qqPowheg.h \ MEee2gZ2llPowheg.cc MEee2gZ2llPowheg.h diff --git a/Models/Makefile.am b/Models/Makefile.am --- a/Models/Makefile.am +++ b/Models/Makefile.am @@ -1,181 +1,181 @@ SUBDIRS = RSModel StandardModel General Susy UED Zprime \ Transplanckian ADD Leptoquarks Sextet TTbAsymm \ LH LHTP Feynrules noinst_LTLIBRARIES = libHwStandardModel.la nodist_libHwStandardModel_la_SOURCES = \ StandardModel/SM__all.cc libHwStandardModel_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/StandardModel noinst_LTLIBRARIES += libHwModelGenerator.la nodist_libHwModelGenerator_la_SOURCES = \ General/ModelGenerator__all.cc libHwModelGenerator_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/General if WANT_BSM pkglib_LTLIBRARIES = \ HwRSModel.la \ HwUED.la \ HwSusy.la \ HwNMSSM.la \ HwRPV.la \ HwZprimeModel.la \ HwTransplanck.la \ HwADDModel.la \ HwLeptoquarkModel.la \ HwSextetModel.la \ HwTTbAModel.la \ HwLHModel.la \ HwLHTPModel.la endif ############# HwRSModel_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 11:0:0 +$(AM_LDFLAGS) -module -version-info 12:0:0 HwRSModel_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/RSModel nodist_HwRSModel_la_SOURCES = \ RSModel/RS__all.cc ############# HwUED_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 11:0:0 +$(AM_LDFLAGS) -module -version-info 12:0:0 HwUED_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/UED nodist_HwUED_la_SOURCES = \ UED/UED__all.cc ############# HwSusy_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 14:0:0 +$(AM_LDFLAGS) -module -version-info 15:0:0 HwSusy_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/Susy nodist_HwSusy_la_SOURCES = \ Susy/Susy__all.cc ############# HwNMSSM_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 6:0:0 +$(AM_LDFLAGS) -module -version-info 7:0:0 HwNMSSM_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/Susy/NMSSM nodist_HwNMSSM_la_SOURCES = \ Susy/NMSSM/NMSSM__all.cc ############# HwRPV_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 4:0:0 +$(AM_LDFLAGS) -module -version-info 5:0:0 HwRPV_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/Susy/RPV nodist_HwRPV_la_SOURCES = \ Susy/RPV/RPV__all.cc ############# HwZprimeModel_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 4:0:0 +$(AM_LDFLAGS) -module -version-info 5:0:0 HwZprimeModel_la_SOURCES = \ Zprime/ZprimeModel.cc Zprime/ZprimeModelZPQQVertex.cc ############# HwTransplanck_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 5:0:0 +$(AM_LDFLAGS) -module -version-info 6:0:0 HwTransplanck_la_SOURCES = \ Transplanckian/METRP2to2.cc ############# HwADDModel_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 5:0:0 +$(AM_LDFLAGS) -module -version-info 6:0:0 HwADDModel_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/ADD nodist_HwADDModel_la_SOURCES = \ ADD/ADD__all.cc ############# HwLeptoquarkModel_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 6:0:0 +$(AM_LDFLAGS) -module -version-info 7:0:0 HwLeptoquarkModel_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/Leptoquarks nodist_HwLeptoquarkModel_la_SOURCES = \ Leptoquarks/Leptoquark__all.cc ############# HwSextetModel_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 4:0:0 +$(AM_LDFLAGS) -module -version-info 5:0:0 HwSextetModel_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/Sextet nodist_HwSextetModel_la_SOURCES = \ Sextet/Sextet__all.cc ############# HwTTbAModel_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 4:0:0 +$(AM_LDFLAGS) -module -version-info 5:0:0 HwTTbAModel_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/TTbAsymm nodist_HwTTbAModel_la_SOURCES = \ TTbAsymm/TTbA__all.cc ############# HwLHModel_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 6:0:0 +$(AM_LDFLAGS) -module -version-info 7:0:0 HwLHModel_la_CPPFLAGS = \ $(AM_CPPFLAGS) -I$(srcdir)/LH nodist_HwLHModel_la_SOURCES = \ LH/LH__all.cc ############# HwLHTPModel_la_LDFLAGS = \ -$(AM_LDFLAGS) -module -version-info 6:0:0 +$(AM_LDFLAGS) -module -version-info 7:0:0 HwLHTPModel_la_LIBADD = \ $(GSLLIBS) HwLHTPModel_la_CPPFLAGS = \ $(AM_CPPFLAGS) $(GSLINCLUDE) -I$(srcdir)/LHTP nodist_HwLHTPModel_la_SOURCES = \ LHTP/LHTP__all.cc ############# diff --git a/Sampling/Makefile.am b/Sampling/Makefile.am --- a/Sampling/Makefile.am +++ b/Sampling/Makefile.am @@ -1,40 +1,40 @@ SUBDIRS = CellGrids pkglib_LTLIBRARIES = HwSampling.la -HwSampling_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 7:0:0 +HwSampling_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 8: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/Dipole/Makefile.am b/Shower/Dipole/Makefile.am --- a/Shower/Dipole/Makefile.am +++ b/Shower/Dipole/Makefile.am @@ -1,23 +1,23 @@ SUBDIRS = Base Kernels Kinematics Utility AlphaS Merging SpinCorrelations pkglib_LTLIBRARIES = HwDipoleShower.la -HwDipoleShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 10:0:0 +HwDipoleShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 11:0:0 HwDipoleShower_la_LIBADD = \ Base/libHwDipoleShowerBase.la \ Kernels/libHwDipoleShowerKernels.la \ Kinematics/libHwDipoleShowerKinematics.la \ Utility/libHwDipoleShowerUtility.la \ Merging/libHwDipoleShowerMerging.la \ SpinCorrelations/libHwDipoleShowerSpinCorrelations.la HwDipoleShower_la_SOURCES = \ DipoleShowerHandler.h DipoleShowerHandler.fh DipoleShowerHandler.cc pkglib_LTLIBRARIES += HwKrknloEventReweight.la HwKrknloEventReweight_la_SOURCES = \ KrkNLO/KrknloEventReweight.h KrkNLO/KrknloEventReweight.cc -HwKrknloEventReweight_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 2:0:0 +HwKrknloEventReweight_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 3:0:0 diff --git a/Shower/QTilde/Makefile.am b/Shower/QTilde/Makefile.am --- a/Shower/QTilde/Makefile.am +++ b/Shower/QTilde/Makefile.am @@ -1,45 +1,45 @@ SUBDIRS = Matching pkglib_LTLIBRARIES = HwShower.la -HwShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 26:0:0 +HwShower_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 27:0:0 HwShower_la_SOURCES = \ Couplings/ShowerAlphaQCD.h Couplings/ShowerAlphaQCD.cc \ Couplings/ShowerAlphaQED.h Couplings/ShowerAlphaQED.cc\ QTildeShowerHandler.h QTildeShowerHandler.fh QTildeShowerHandler.cc \ SplittingFunctions/HalfHalfOneSplitFn.h SplittingFunctions/HalfHalfOneSplitFn.cc\ SplittingFunctions/OneOneOneSplitFn.h SplittingFunctions/OneOneOneSplitFn.cc\ SplittingFunctions/OneOneOneMassiveSplitFn.h SplittingFunctions/OneOneOneMassiveSplitFn.cc\ SplittingFunctions/ZeroZeroOneSplitFn.h SplittingFunctions/ZeroZeroOneSplitFn.cc\ SplittingFunctions/OneHalfHalfSplitFn.h SplittingFunctions/OneHalfHalfSplitFn.cc\ SplittingFunctions/HalfOneHalfSplitFn.h SplittingFunctions/HalfOneHalfSplitFn.cc\ SplittingFunctions/CMWOneOneOneSplitFn.h SplittingFunctions/CMWOneOneOneSplitFn.cc\ SplittingFunctions/CMWHalfHalfOneSplitFn.h SplittingFunctions/CMWHalfHalfOneSplitFn.cc\ Kinematics/Decay_QTildeShowerKinematics1to2.cc \ Kinematics/Decay_QTildeShowerKinematics1to2.h \ Kinematics/IS_QTildeShowerKinematics1to2.cc Kinematics/IS_QTildeShowerKinematics1to2.h \ Kinematics/FS_QTildeShowerKinematics1to2.cc Kinematics/FS_QTildeShowerKinematics1to2.h \ Kinematics/KinematicsReconstructor.cc \ Kinematics/KinematicsReconstructor.tcc \ Kinematics/KinematicsReconstructor.h \ Kinematics/KinematicsReconstructor.fh \ Base/HardTree.cc Base/HardTree.h Base/HardTree.fh \ Base/HardBranching.h Base/HardBranching.fh Base/HardBranching.cc\ Base/PartnerFinder.h Base/PartnerFinder.fh Base/PartnerFinder.cc \ Base/ShowerVeto.h Base/ShowerVeto.fh Base/ShowerVeto.cc \ Base/FullShowerVeto.h Base/FullShowerVeto.fh Base/FullShowerVeto.cc \ SplittingFunctions/SplittingGenerator.cc SplittingFunctions/SplittingGenerator.h\ SplittingFunctions/SplittingGenerator.fh \ Base/ShowerTree.h Base/ShowerTree.fh Base/ShowerTree.cc \ ShowerConfig.h ShowerConfig.cc \ Base/Branching.h \ Base/ShowerParticle.cc Base/ShowerParticle.fh Base/ShowerParticle.h \ Kinematics/ShowerKinematics.fh Kinematics/ShowerKinematics.h Kinematics/ShowerKinematics.cc \ Kinematics/ShowerBasis.fh Kinematics/ShowerBasis.h Kinematics/ShowerBasis.cc \ Base/ShowerProgenitor.fh Base/ShowerProgenitor.h \ SplittingFunctions/SudakovFormFactor.cc SplittingFunctions/SudakovFormFactor.h SplittingFunctions/SudakovFormFactor.fh \ SplittingFunctions/SudakovCutOff.cc SplittingFunctions/SudakovCutOff.h SplittingFunctions/SudakovCutOff.fh \ SplittingFunctions/PTCutOff.cc SplittingFunctions/PTCutOff.h \ SplittingFunctions/MassCutOff.cc SplittingFunctions/MassCutOff.h \ SplittingFunctions/VariableMassCutOff.cc SplittingFunctions/VariableMassCutOff.h \ SplittingFunctions/SplittingFunction.h SplittingFunctions/SplittingFunction.fh \ SplittingFunctions/SplittingFunction.cc \ Base/ShowerVertex.cc Base/ShowerVertex.fh Base/ShowerVertex.h diff --git a/Shower/QTilde/Matching/Makefile.am b/Shower/QTilde/Matching/Makefile.am --- a/Shower/QTilde/Matching/Makefile.am +++ b/Shower/QTilde/Matching/Makefile.am @@ -1,8 +1,8 @@ pkglib_LTLIBRARIES = HwMatching.la -HwMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 5:0:0 +HwMatching_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 6:0:0 HwMatching_la_SOURCES = \ PowhegShowerHandler.h PowhegShowerHandler.cc \ CKKWTree.h CKKWTree.fh CKKWTree.cc \ 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,11 +1,11 @@ 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 15:0:0 +HwMPI_la_LDFLAGS= $(AM_LDFLAGS) -module -version-info 16:0:0 HwMPI_la_LIBADD= $(GSLLIBS) HwMPI_la_CPPFLAGS= $(AM_CPPFLAGS) $(GSLINCLUDE) 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 26:0:0 +Herwig_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 27:0:0 Herwig_la_LDFLAGS += $(THEPEGLDFLAGS) $(BOOST_SYSTEM_LDFLAGS) $(BOOST_FILESYSTEM_LDFLAGS) $(FCLIBS) Herwig_la_LIBADD = \ $(top_builddir)/Hadronization/libHwHadronization.la \ $(top_builddir)/Models/libHwStandardModel.la \ $(top_builddir)/Decay/libHwDecay.la \ $(top_builddir)/Decay/libHwFormFactor.la \ $(top_builddir)/Decay/libHwDecRad.la \ $(top_builddir)/Utilities/libHwUtils.la \ $(top_builddir)/Models/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/libHwWeakCurrent.la \ $(top_builddir)/Looptools/libHwLooptools.la \ $(top_builddir)/Shower/libHwShower.la \ $(THEPEGLIB) -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