diff --git a/analyses/Makefile.am b/analyses/Makefile.am --- a/analyses/Makefile.am +++ b/analyses/Makefile.am @@ -1,54 +1,53 @@ AUTOMAKE_OPTIONS = -Wno-portability SHELL := bash -O extglob if ENABLE_ANALYSES 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 $(abs_srcdir)/plugin*/*.{info,plot,yoda}) CLEANFILES = $(PLUGIN_LIBS) EXTRA_DIST = $(PLUGIN_DIRS) %.so: @+echo && RIVET_BUILDPLUGIN_BEFORE_INSTALL=1 bash $(top_builddir)/bin/rivet-buildplugin -j2 $@ $^ -I$(top_builddir)/include RivetALICEAnalyses.so: $(shell ls $(srcdir)/pluginALICE/!(tmp)*.cc) RivetATLASAnalyses.so: $(shell ls $(srcdir)/pluginATLAS/!(tmp)*.cc) RivetCDFAnalyses.so : $(shell ls $(srcdir)/pluginCDF/!(tmp)*.cc) RivetCMSAnalyses.so : $(shell ls $(srcdir)/pluginCMS/!(tmp)*.cc) RivetD0Analyses.so : $(shell ls $(srcdir)/pluginD0/!(tmp)*.cc) RivetHERAAnalyses.so : $(shell ls $(srcdir)/pluginHERA/!(tmp)*.cc) RivetLEPAnalyses.so : $(shell ls $(srcdir)/pluginLEP/!(tmp)*.cc) RivetLHCbAnalyses.so : $(shell ls $(srcdir)/pluginLHCb/!(tmp)*.cc) RivetLHCfAnalyses.so : $(shell ls $(srcdir)/pluginLHCf/!(tmp)*.cc) RivetMCAnalyses.so : $(shell ls $(srcdir)/pluginMC/!(tmp)*.cc) RivetMiscAnalyses.so : $(shell ls $(srcdir)/pluginMisc/!(tmp)*.cc) RivetPetraAnalyses.so: $(shell ls $(srcdir)/pluginPetra/!(tmp)*.cc) RivetRHICAnalyses.so : $(shell ls $(srcdir)/pluginRHIC/!(tmp)*.cc) RivetSPSAnalyses.so : $(shell ls $(srcdir)/pluginSPS/!(tmp)*.cc) RivetTOTEMAnalyses.so: $(shell ls $(srcdir)/pluginTOTEM/!(tmp)*.cc) all-local: $(PLUGIN_LIBS) $(PLUGIN_DATAFILES) mkdir -p $(builddir)/data $(LN_S) -f $(abs_srcdir)/plugin*/*.{info,plot,yoda} $(builddir)/data clean-local: rm -rf data install-exec-local: $(PLUGIN_LIBS) $(INSTALL) $^ $(DESTDIR)$(libdir) install-data-local: $(PLUGIN_DATAFILES) @echo "Installing analysis data files..." $(mkdir_p) $(DESTDIR)$(pkgdatadir) - cp $(abs_srcdir)/plugin*/*.{info,plot,yoda} $(DESTDIR)$(pkgdatadir)/ -#@$(install_sh_DATA) $^ $(DESTDIR)$(pkgdatadir) + rsync -aq $(abs_srcdir)/plugin*/*.{info,plot,yoda} $(DESTDIR)$(pkgdatadir)/ || cp $(abs_srcdir)/plugin*/*.{info,plot,yoda} $(DESTDIR)$(pkgdatadir)/ uninstall-local: cd $(DESTDIR)$(libdir) && rm -f $(PLUGIN_LIBS) @echo "Uninstalling analysis data files..." rm -f $(DESTDIR)$(pkgdatadir)/*.{info,plot,yoda} endif diff --git a/doc/Makefile.am b/doc/Makefile.am --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,127 +1,127 @@ dist_noinst_SCRIPTS = mk-analysis-html mk-analysis-latex mk-analysis-json LATEXSUBSOURCES = preamble.tex intro.tex gettingstarted.tex writinganalyses.tex agilerunmc.tex acknowledgements.tex DOCSOURCES = $(LATEXSUBSOURCES) \ compare-histos.txt slip.eps thinker.eps cone.eps bend.eps \ h-physrev3.bst hepnames.sty JHEP3.cls JHEP.bst make-plots.txt rivet-manual.tex \ heppennames.sty hepnicenames.sty hepparticles.sty maybemath.sty \ hepunits.sty underscore.sty microtype.sty EXTRA_DIST = $(DOCSOURCES) refs.bib DOCS = DOCDIRS = if ENABLE_PYEXT DOCS += analyses.html DOCDIRS += analyses analyses.html: $(top_srcdir)/analyses $(srcdir)/mk-analysis-html LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \ DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(DYLD_LIBRARY_PATH) \ PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \ $(PYTHON) $(srcdir)/mk-analysis-html endif if ENABLE_PYEXT DOCS += analyses.json analyses.json: $(top_srcdir)/analyses $(srcdir)/mk-analysis-json LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(LD_LIBRARY_PATH) \ DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(DYLD_LIBRARY_PATH) \ PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \ $(PYTHON) $(srcdir)/mk-analysis-json endif if WITH_ASCIIDOC DOCS += compare-histos.html make-plots.html EXTRA_DIST += compare-histos.html make-plots.html compare-histos.html: compare-histos.txt asciidoc -a toc compare-histos.txt make-plots.html: make-plots.txt asciidoc -a toc make-plots.txt endif if ENABLE_PDFMANUAL if WITH_PDFLATEX DOCS += rivet-manual.pdf if ENABLE_PYEXT analyses.bib analyses.tex: $(top_srcdir)/analyses $(srcdir)/mk-analysis-latex LD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(LD_LIBRARY_PATH) \ DYLD_LIBRARY_PATH=$(top_builddir)/src/.libs:$(YAML_CPPLIBPATH):$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(YODALIBPATH):$(DYLD_LIBRARY_PATH) \ PYTHONPATH=$(YODA_PYTHONPATH):$(RIVET_PYTHONPATH):$(PYTHONPATH) \ $(PYTHON) $(srcdir)/mk-analysis-latex else analyses.bib analyses.tex: > analyses.tex > analyses.bib endif LATEX = pdflatex --interaction=batchmode RERUN = "(There were undefined references|Rerun to get (cross-references|the bars) right)" RERUNBIB = "No file.*\.bbl|Citation.*undefined" MAKEIDX = "^[^%]*\\makeindex" rivet-manual.pdf : rivet-manual.tex $(LATEXSUBSOURCES) analyses.tex refs.bib analyses.bib $(LATEX) $<; true egrep -c $(RERUNBIB) rivet-manual.log && (bibtex rivet-manual && cp rivet-manual.toc rivet-manual.toc.bak && $(LATEX) $<); true for i in `seq 5`; do if egrep $(RERUN) rivet-manual.log; then echo "LaTeX re-run $i"; cp rivet-manual.toc rivet-manual.toc.bak; $(LATEX) $<; else break; fi; done; true if cmp -s rivet-manual.toc rivet-manual.toc.bak; then true; else $(LATEX) $<; true; fi rm -f rivet-manual.toc.bak; true paper.pdf : paper.tex $(LATEXSUBSOURCES) analyses.tex refs.bib analyses.bib $(LATEX) $<; true egrep -c $(RERUNBIB) paper.log && (bibtex paper && cp paper.toc paper.toc.bak && $(LATEX) $<); true for i in `seq 5`; do if egrep $(RERUN) paper.log; then echo "LaTeX re-run $i"; cp paper.toc paper.toc.bak; $(LATEX) $<; else break; fi; done; true if cmp -s paper.toc paper.toc.bak; then true; else $(LATEX) $<; true; fi rm -f paper.toc.bak; true endif endif ################ .PHONY = all doc upload arxivtar doc: $(DOCS) @true RSH = rsync DEST = login.hepforge.org:rivet/public_html/ upload: $(DOCS) $(DOCDIRS) $(RSH) -r $? $(DEST) arxivtar: $(DOCSOURCES) rivet-manual.bbl for i in *.png; do convert $$i $${i/.png/.eps}; done tar czf rivet-manual.tar.gz \ rivet-manual.tex $(LATEXSUBSOURCES) analyses.tex refs.bib analyses.bib rivetversion.sty rivet-manual.bbl \ hepnames.sty hepnicenames.sty hepparticles.sty heppennames.sty hepunits.sty maybemath.sty microtype.sty underscore.sty \ bend.eps cone.eps thinker.eps slip.eps \ h-physrev3.bst JHEP3.cls JHEP.bst ## Install! pkgdata_DATA = $(DOCS) install-data-local: doc @$(NORMAL_INSTALL) - test "$(DOCDIRS)" && cp -r $(DOCDIRS) $(DESTDIR)$(pkgdatadir)/ + test "$(DOCDIRS)" && ( rsync -aq $(DOCDIRS) $(DESTDIR)$(pkgdatadir)/ || cp -r $(DOCDIRS) $(DESTDIR)$(pkgdatadir)/ ) uninstall-local: @$(NORMAL_UNINSTALL) rm -rf $(DESTDIR)$(pkgdatadir)/analyses mostlyclean-local: rm -rf *.aux *.log *.toc clean-local: rm -rf $(DOCS) $(DOCDIRS)