diff --git a/Makefile.am b/Makefile.am index c782ac6..ea302d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -93,6 +93,36 @@ html-local: $(htmlize_el) $(dist_html_DATA) text: $(htmlize_el) $(dist_text_DATA) doc: html text +setup_py = $(srcdir)/python/setup.py +process_header_py = $(srcdir)/python/src/process_header.py +test_py = $(srcdir)/python/test/test_api.py +qmckl_i = $(srcdir)/python/src/qmckl.i +numpy_i = $(srcdir)/python/src/numpy.i +qmckl_wrap_c = python/src/qmckl_wrap.c +qmckl_include_i = python/src/qmckl_include.i +qmckl_py = python/src/qmckl.py + +dist_python_DATA = $(setup_py) $(qmckl_py) $(qmckl_wrap_c) \ + $(srcdir)/python/pyproject.toml \ + $(srcdir)/python/requirements.txt \ + $(srcdir)/python/README.md + +python-install: $(qmckl_h) $(lib_LTLIBRARIES) $(dist_python_DATA) + $(MKDIR_P) python/src + cd python ; \ + [[ ! -f pyproject.toml ]] && \ + cp $(abs_srcdir)/python/{pyproject.toml,requirements.txt,README.md,setup.py} . ; \ + cp src/qmckl.py . ; \ + export QMCKL_INCLUDEDIR="$(prefix)/include" ; \ + export QMCKL_LIBDIR="$(prefix)/lib" ; \ + pip install . + +python-test: $(test_py) + cd $(abs_srcdir)/python/test/ && \ + python test_api.py + +.PHONY: python-test python-install cppcheck + if QMCKL_DEVEL @@ -170,15 +200,6 @@ cppcheck.out: $(qmckl_h) --language=c --std=c99 -rp --platform=unix64 \ -I$(srcdir)/include -I$(top_builddir)/include *.c *.h 2>../$@ -setup_py = $(srcdir)/python/setup.py -process_header_py = $(srcdir)/python/src/process_header.py -test_py = $(srcdir)/python/test/test_api.py -qmckl_i = $(srcdir)/python/src/qmckl.i -numpy_i = $(srcdir)/python/src/numpy.i -qmckl_wrap_c = python/src/qmckl_wrap.c -qmckl_include_i = python/src/qmckl_include.i -qmckl_py = python/qmckl/qmckl.py - $(qmckl_include_i): $(qmckl_h) $(process_header_py) $(MKDIR_P) python/src python $(process_header_py) $(qmckl_h) @@ -190,24 +211,9 @@ $(qmckl_py): $(qmckl_i) $(qmckl_include_i) $(qmckl_wrap_c): $(qmckl_py) -python-install: $(qmckl_h) $(qmckl_i) $(setup_py) $(qmckl_py) $(qmckl_wrap_c) - $(MKDIR_P) python/src - cd python ; \ - [[ ! -f pyproject.toml ]] && \ - cp $(abs_srcdir)/python/{pyproject.toml,requirements.txt,README.md,setup.py} . ; \ - cp src/qmckl.py . ; \ - export QMCKL_INCLUDEDIR="$(prefix)/include" ; \ - export QMCKL_LIBDIR="$(prefix)/lib" ; \ - pip install . - -python-test: $(test_py) - cd $(abs_srcdir)/python/test/ && \ - python test_api.py CLEANFILES += $(qmckl_wrap_c) \ $(qmckl_include_i) \ $(qmckl_py) -.PHONY: cppcheck python-test python-install - endif diff --git a/configure.ac b/configure.ac index ca736be..e8e09c6 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AC_PREREQ([2.69]) -AC_INIT([qmckl],[0.1.1],[https://github.com/TREX-CoE/qmckl/issues],[],[https://trex-coe.github.io/qmckl/index.html]) +AC_INIT([qmckl],[0.2.1],[https://github.com/TREX-CoE/qmckl/issues],[],[https://trex-coe.github.io/qmckl/index.html]) AC_CONFIG_AUX_DIR([tools]) AM_INIT_AUTOMAKE([subdir-objects color-tests parallel-tests silent-rules 1.11])