[Rivet-svn] rivet: 3 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/b436cea725b9
branches:  
changeset: 6053:b436cea725b9
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Thu Sep 28 11:32:32 2017 +0200
description:
Fix ambiguous ternary operator

details:   https://rivet.hepforge.org/hg/rivet/rev/e1517f4692e3
branches:  
changeset: 6054:e1517f4692e3
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Sep 29 08:52:55 2017 +0200
description:
Fix out-of-source analysis build

details:   https://rivet.hepforge.org/hg/rivet/rev/946b4962f579
branches:  
changeset: 6055:946b4962f579
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Sep 29 08:53:18 2017 +0200
description:
Remove generated file from repo

diffs (truncated from 134 to 50 lines):

--- a/analyses/Makefile.am	Tue Sep 26 17:07:43 2017 +0100
+++ b/analyses/Makefile.am	Fri Sep 29 08:53:18 2017 +0200
@@ -2,36 +2,36 @@
 
 if ENABLE_ANALYSES
 
-PLUGIN_DIRS = $(wildcard plugin*)
-PLUGIN_NAMES = $(subst plugin,,$(PLUGIN_DIRS))
-PLUGIN_LIBS = $(patsubst plugin%,Rivet%Analyses.so,$(PLUGIN_DIRS))
-PLUGIN_DATAFILES = $(wildcard plugin*/*.info plugin*/*.plot plugin*/*.yoda)
+PLUGIN_DIRS = $(shell ls -d $(srcdir)/plugin*)
+PLUGIN_NAMES = $(notdir $(subst plugin,,$(PLUGIN_DIRS)))
+PLUGIN_LIBS = $(patsubst %,Rivet%Analyses.so,$(PLUGIN_NAMES))
+PLUGIN_DATAFILES = $(shell ls $(srcdir)/plugin*/*.{info,plot,yoda})
 
 CLEANFILES = $(PLUGIN_LIBS)
 EXTRA_DIST = $(PLUGIN_DIRS)
 
 %.so:
-	@+echo && RIVET_BUILDPLUGIN_BEFORE_INSTALL=1 bash $(top_srcdir)/bin/rivet-buildplugin -j2 $@ $^
+	@+echo && RIVET_BUILDPLUGIN_BEFORE_INSTALL=1 bash $(top_builddir)/bin/rivet-buildplugin -j2 $@ $^ -I$(top_builddir)/include
 
-RivetALICEAnalyses.so: $(wildcard pluginALICE/*.cc)
-RivetATLASAnalyses.so: $(wildcard pluginATLAS/*.cc)
-RivetCDFAnalyses.so: $(wildcard pluginCDF/*.cc)
-RivetCMSAnalyses.so: $(wildcard pluginCMS/*.cc)
-RivetD0Analyses.so: $(wildcard pluginD0/*.cc)
-RivetHERAAnalyses.so: $(wildcard pluginHERA/*.cc)
-RivetLEPAnalyses.so: $(wildcard pluginLEP/*.cc)
-RivetLHCbAnalyses.so: $(wildcard pluginLHCb/*.cc)
-RivetLHCfAnalyses.so: $(wildcard pluginLHCf/*.cc)
-RivetMCAnalyses.so: $(wildcard pluginMC/*.cc)
-RivetMiscAnalyses.so: $(wildcard pluginMisc/*.cc)
-RivetPetraAnalyses.so: $(wildcard pluginPetra/*.cc)
-RivetRHICAnalyses.so: $(wildcard pluginRHIC/*.cc)
-RivetSPSAnalyses.so: $(wildcard pluginSPS/*.cc)
-RivetTOTEMAnalyses.so: $(wildcard pluginTOTEM/*.cc)
+RivetALICEAnalyses.so: $(shell ls $(srcdir)/pluginALICE/*.cc)
+RivetATLASAnalyses.so: $(shell ls $(srcdir)/pluginATLAS/*.cc)
+RivetCDFAnalyses.so  : $(shell ls $(srcdir)/pluginCDF/*.cc)
+RivetCMSAnalyses.so  : $(shell ls $(srcdir)/pluginCMS/*.cc)
+RivetD0Analyses.so   : $(shell ls $(srcdir)/pluginD0/*.cc)
+RivetHERAAnalyses.so : $(shell ls $(srcdir)/pluginHERA/*.cc)
+RivetLEPAnalyses.so  : $(shell ls $(srcdir)/pluginLEP/*.cc)
+RivetLHCbAnalyses.so : $(shell ls $(srcdir)/pluginLHCb/*.cc)
+RivetLHCfAnalyses.so : $(shell ls $(srcdir)/pluginLHCf/*.cc)
+RivetMCAnalyses.so   : $(shell ls $(srcdir)/pluginMC/*.cc)
+RivetMiscAnalyses.so : $(shell ls $(srcdir)/pluginMisc/*.cc)
+RivetPetraAnalyses.so: $(shell ls $(srcdir)/pluginPetra/*.cc)
+RivetRHICAnalyses.so : $(shell ls $(srcdir)/pluginRHIC/*.cc)