Commit e9c710135c40ec7eca82b2ee2fc8039ce737b6a9
1 parent
43d69712
Fix configures and python test
Showing
3 changed files
with
7 additions
and
7 deletions
configure.ac
| ... | ... | @@ -630,7 +630,7 @@ else |
| 630 | 630 | |
| 631 | 631 | # Do we have wrappers (ctools_wrap.cpp and ctools.py)? |
| 632 | 632 | has_wrappers="yes" |
| 633 | - AC_CHECK_FILES([pyext/ctools_wrap.cpp pyext/ctools.py],, | |
| 633 | + AC_CHECK_FILES([pyext/ctools/ctools_wrap.cpp pyext/ctools/ctools.py],, | |
| 634 | 634 | [has_wrappers="no"]) |
| 635 | 635 | if test "x$has_wrappers" = "xno"; then |
| 636 | 636 | AC_MSG_WARN([Python wrapper missing. Requires swig for wrapper generation.]) |
| ... | ... | @@ -669,7 +669,7 @@ if test "x$enable_python" = "xyes"; then |
| 669 | 669 | |
| 670 | 670 | else |
| 671 | 671 | if test "x$has_python_wrap" = "xno" -a "x$has_swig" = "xno"; then |
| 672 | - AC_MSG_WARN([Neither pyext/ctools_wrap.cpp and pyext/ctools.py nor swig has not been found]) | |
| 672 | + AC_MSG_WARN([Neither pyext/ctools/ctools_wrap.cpp and pyext/ctools/ctools.py nor swig has not been found]) | |
| 673 | 673 | AC_MSG_WARN([Python binding for ctools cannot be built]) |
| 674 | 674 | AC_MSG_WARN([Either use a ctools distribution with ctools_wrap.cpp and ctools.py shipped or install swig on your system]) |
| 675 | 675 | AC_MSG_WARN([swig can be obtained from http://www.swig.org/]) | ... | ... |
pyext/Makefile.am
| ... | ... | @@ -39,7 +39,7 @@ include $(DEPFILES) |
| 39 | 39 | # Define the targets that should be built before anything else. |
| 40 | 40 | # These are honored by 'make all', 'make check' and 'make install'. |
| 41 | 41 | if HAVE_SWIG |
| 42 | - BUILT_SOURCES = ctools_wrap.cpp ctools/ctools.py | |
| 42 | + BUILT_SOURCES = ctools/ctools_wrap.cpp ctools/ctools.py | |
| 43 | 43 | endif |
| 44 | 44 | |
| 45 | 45 | # Set files to be removed in clean. We remove only the SWIG interface files |
| ... | ... | @@ -59,7 +59,7 @@ all-local: build |
| 59 | 59 | # of this specific directory. So we build one instance for checking, the other |
| 60 | 60 | # for installation. If we could get the name built by distutils we could avoid |
| 61 | 61 | # this. |
| 62 | -build: ctools_wrap.cpp ctools/ctools.py | |
| 62 | +build: ctools/ctools_wrap.cpp ctools/ctools.py | |
| 63 | 63 | $(PYTHON) setup.py build |
| 64 | 64 | |
| 65 | 65 | install-exec-local: |
| ... | ... | @@ -70,8 +70,8 @@ clean-local: |
| 70 | 70 | |
| 71 | 71 | # Rule for building Python wrappers using SWIG. |
| 72 | 72 | if HAVE_SWIG |
| 73 | -ctools/ctools.py: ctools_wrap.cpp | |
| 74 | -ctools_wrap.cpp: $(SWIG_INTERFACE) | |
| 73 | +ctools/ctools.py: ctools/ctools_wrap.cpp | |
| 74 | +ctools/ctools_wrap.cpp: $(SWIG_INTERFACE) | |
| 75 | 75 | if $(SWIGCOMPILE) -MMD -MF "ctools.Tpi" -o ctools/ctools_wrap.cpp $<; \ |
| 76 | 76 | then mv -f "ctools.Tpi" "ctools.Pi"; else rm -f "ctools.Tpi"; exit 1; fi |
| 77 | 77 | endif # HAVE_SWIG | ... | ... |
test/Makefile.am
| ... | ... | @@ -8,7 +8,7 @@ MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@ |
| 8 | 8 | if WITH_PYTHON |
| 9 | 9 | TEST_CSCRIPTS = test_cscripts.sh |
| 10 | 10 | TEST_PYTHON_SCRIPT = test_python.py |
| 11 | - TEST_PYTHON_ENV = PYTHONPATH=$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools:$(top_builddir)/scripts:$(pythondir):$(pyexecdir):$(PYTHONPATH) | |
| 11 | + TEST_PYTHON_ENV = PYTHONPATH=$(top_builddir)/pyext:$(top_builddir)/pyext/build/ctools/ctools:$(top_builddir)/scripts:$(pythondir):$(pyexecdir):$(PYTHONPATH) | |
| 12 | 12 | endif |
| 13 | 13 | |
| 14 | 14 | # Set test environment | ... | ... |