From c69513cdc56f2a6cada5f15d734e5d395c5b17e7 Mon Sep 17 00:00:00 2001 From: q-posev Date: Wed, 4 May 2022 15:43:50 +0200 Subject: [PATCH] Fix Makefile --- Makefile.am | 10 +++++----- python/build_pyqmckl.sh | 6 +++--- python/pip_install_pyqmckl.sh | 3 --- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6065675..52ccd7f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -172,9 +172,9 @@ cppcheck.out: $(qmckl_h) setup_py = $(srcdir)/python/setup.py process_header_py = $(srcdir)/python/src/process_header.py -pyqmckl_py = $(srcdir)/python/pyqmckl/pyqmckl.py +qmckl_py = $(srcdir)/python/qmckl.py test_py = $(srcdir)/python/test/test_api.py -pyqmckl_wrap_c = $(srcdir)/python/src/pyqmckl_wrap.c +qmckl_wrap_c = $(srcdir)/python/src/qmckl_wrap.c pyqmckl_i = $(srcdir)/python/src/pyqmckl.i pyqmckl_include_i = $(srcdir)/python/src/pyqmckl_include.i numpy_i = $(srcdir)/python/src/numpy.i @@ -189,9 +189,9 @@ python-test: $(test_py) cd $(srcdir)/python/test/ && \ python test_api.py -CLEANFILES += $(pyqmckl_wrap_c) \ - $(pyqmckl_include_i) \ - $(pyqmckl_py) +CLEANFILES += $(qmckl_wrap_c) \ + $(qmckl_py) \ + $(pyqmckl_include_i) .PHONY: cppcheck python-test python-install diff --git a/python/build_pyqmckl.sh b/python/build_pyqmckl.sh index 22916c8..961db80 100755 --- a/python/build_pyqmckl.sh +++ b/python/build_pyqmckl.sh @@ -3,13 +3,13 @@ set -e set -x -cp ../include/qmckl.h src/ +#cp ../include/qmckl.h src/ cd src/ # check if qmckl header exists if [[ ! -f 'qmckl.h' ]]; then - echo "qmckl.h NOT FOUND" + echo "qmckl.h NOT FOUND in the src/ directory" exit 1 fi @@ -20,7 +20,7 @@ python process_header.py SWIG_LIST='pyqmckl.i pyqmckl_include.i numpy.i' for file in $SWIG_LIST; do if [[ ! -f $file ]]; then - echo "$file NOT FOUND" + echo "$file NOT FOUND in the src/ directory" exit 1 fi done diff --git a/python/pip_install_pyqmckl.sh b/python/pip_install_pyqmckl.sh index 846d571..6af48a4 100755 --- a/python/pip_install_pyqmckl.sh +++ b/python/pip_install_pyqmckl.sh @@ -12,6 +12,3 @@ cp src/qmckl.py ./ # install using pip pip install . -cd test -python test_api.py -cd ..