Page MenuHomeHEPForge
Files F7879100

No OneTemporary
Actions

View Options

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,39 +1,39 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src pyext data include bin doc test
EXTRA_DIST = GUIDELINES
DISTCHECK_CONFIGURE_FLAGS = --enable-debug --with-yoda=$(YODAPATH) --with-hepmc=$(HEPMCPATH) --with-fastjet=$(FASTJETPATH)
pkgconfigdir = $(libdir)/pkgconfig
dist_pkgconfig_DATA = rivet.pc
doc:
cd doc && $(MAKE) doc
.PHONY : doc dox pyclean
clean-local:
@rm -rf a.out
## Doxygen
if WITH_DOXYGEN
dox:
@echo "Running Doxygen..."
@$(DOXYGEN) $(top_srcdir)/Doxyfile || true
install-dox:
$(install_sh_DATA) doxy/html/* $(DESTDIR)$(pkgdatadir)/doc/html
mostlyclean-local:
@rm -rf $(top_builddir)/doxy
uninstall-local:
@rm -rf $(DESTDIR)$(pkgdatadir)/doc; \
- test ! -d $(DESTDIR)$(pkgdatadir) || rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)
+ test ! -d $(DESTDIR)$(pkgdatadir) || rmdir $(DESTDIR)$(pkgdatadir) || true
endif
## Upload to HepForge
RSH=rsync
DEST=login.hepforge.org:rivet/downloads/
upload: dist
$(RSH) $(DIST_ARCHIVES) $(DEST)
diff --git a/pyext/rivet/Makefile.am b/pyext/rivet/Makefile.am
--- a/pyext/rivet/Makefile.am
+++ b/pyext/rivet/Makefile.am
@@ -1,38 +1,38 @@
EXTRA_DIST = \
__init__.py util.py \
plotinfo.py spiresbib.py \
core.pyx rivet.pxd \
core.cpp
if WITH_CYTHON
RIVETINCLUDE = $(top_srcdir)/include/Rivet/
core.cpp: core.pyx rivet.pxd $(RIVETINCLUDE)/Analysis.hh $(RIVETINCLUDE)/AnalysisHandler.hh $(RIVETINCLUDE)/AnalysisLoader.hh $(RIVETINCLUDE)/Run.hh
- cython core.pyx --cplus
+ cython $(srcdir)/core.pyx --cplus -o $@
else
core.cpp:
@echo "Not (re)generating core.cpp since Cython is not installed"
endif
## fixes for out-of-source builds, especially "make distcheck"
all-local: fix-out-of-source
FIXSOURCES = $(EXTRA_DIST)
fix-out-of-source: $(FIXSOURCES)
rm -f $@
for i in $^; do \
orig="$$i"; \
build="$$(basename $$i)"; \
if [ ! -e $${build} ]; then cp $${orig} $${build}; \
echo $${build} >> $@; fi; \
done
touch $@
clean-local: fix-out-of-source
if [ -e $< ]; then if [ -n "$$(cat $<)" ]; then rm -f $$(cat $<); fi; fi
rm -f $<
diff --git a/pyext/setup.py.in b/pyext/setup.py.in
--- a/pyext/setup.py.in
+++ b/pyext/setup.py.in
@@ -1,47 +1,48 @@
#! /usr/bin/env python
from distutils.core import setup
from distutils.extension import Extension
from glob import glob
## Extension definition
import os.path
-incdir = os.path.abspath("@top_srcdir@/include")
+srcincdir = os.path.abspath("@top_srcdir@/include")
+buildincdir = os.path.abspath("@top_builddir@/include")
srcdir = os.path.abspath("@top_srcdir@/src")
libdir = os.path.abspath("@top_builddir@/src/.libs")
## Assemble the library search dirs
lookupdirs = [
libdir,
"@HEPMCLIBPATH@",
"@FASTJETLIBPATH@",
"@YODALIBPATH@" ]
## Be careful with extracting the GSL path from the flags string
import re
re_libdirflag = re.compile(r".*-L\s*(\S+).*")
re_match = re_libdirflag.search("@GSL_LDFLAGS@")
if re_match:
lookupdirs.append( re_match.group(1) )
## A helper function (since we have two modules now...)
def ext(name, depends=[], statics=[]):
return Extension(
"rivet.%s" % name,
["rivet/%s.cpp" % name] + statics,
language="C++",
depends=depends,
- include_dirs=[incdir, "rivet"],
+ include_dirs=[srcincdir, buildincdir],
extra_compile_args= "-I@prefix@/include @BOOST_CPPFLAGS@ @PYEXT_CXXFLAGS@ @HEPMCCPPFLAGS@ @FASTJETCPPFLAGS@ @YODACPPFLAGS@ @GSLCPPFLAGS@".split(),
library_dirs=lookupdirs,
runtime_library_dirs=lookupdirs[1:],
libraries=["stdc++", "gsl", "HepMC", "fastjet", "YODA", "Rivet"])
header_files = glob("../include/Rivet/*.h") + glob("../include/Rivet/Utils/*.h")
extns = [ext("core", header_files)]
setup(name = "rivet",
version="@PACKAGE_VERSION@",
ext_modules = extns,
packages = ["rivet"])

File Metadata

Mime Type
text/x-diff
Expires
Tue, Nov 19, 7:35 PM (1 d, 8 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3797107
Default Alt Text
(3 KB)

Event Timeline