Mercurial > pytave
changeset 210:04f786b778fc
Change back the unrequired changes
author | genuinelucifer |
---|---|
date | Thu, 26 May 2016 12:48:37 -0700 |
parents | 57807b5fa7bf |
children | 9656f663ca94 |
files | Makefile.am python_to_octave.cc |
diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Thu May 26 11:35:20 2016 -0700 +++ b/Makefile.am Thu May 26 12:48:37 2016 -0700 @@ -38,7 +38,7 @@ pyeval.oct \ pyexec.oct -ssources = $(patsubst %.oct, %.cc, $(OCT_FILES)) +OCT_SOURCES = $(patsubst %.oct, %.cc, $(OCT_FILES)) PYTAVE_HEADER_FILES = \ arrayobjectdefs.h \ @@ -53,7 +53,7 @@ test/exceptions.py \ test/test.py -EXTRA_DIST = $(DOC_FILES) $(ssources) $(PY_FILES) +EXTRA_DIST = $(DOC_FILES) $(OCT_SOURCES) $(PY_FILES) EXTRA_libdir = $(PYTAVE_MODULE_INSTALL_PATH) EXTRA_lib_LTLIBRARIES = _pytave.la
--- a/python_to_octave.cc Thu May 26 11:35:20 2016 -0700 +++ b/python_to_octave.cc Thu May 26 12:48:37 2016 -0700 @@ -477,7 +477,6 @@ + (PyEval_GetFuncDesc (py_object.ptr ()) + std::string (": Unsupported Python object type, " "cannot convert to Octave value"))); - } void pytuple_to_octlist (octave_value_list& octave_list,