diff options
| author | Vadim Zeitlin <vz-swig@zeitlins.org> | 2016-12-05 02:14:51 +0100 |
|---|---|---|
| committer | Vadim Zeitlin <vz-swig@zeitlins.org> | 2016-12-12 01:24:17 +0100 |
| commit | e668c47b70d04ced2247405969ce0d180b419b56 (patch) | |
| tree | d120e9877685d6e130657e9fbd3886d22cd0d230 /Source/Makefile.am | |
| parent | 658f92a993a3c831f73cbc0a79dfc1ce7dd0dc7f (diff) | |
| parent | 3546d096a79857c6ebfe6f150bd7a0f1d6bbd232 (diff) | |
| download | swig-e668c47b70d04ced2247405969ce0d180b419b56.tar.gz | |
Merge branch 'master' into doxygen
The way Python docstrings are indented has changed on master, so use the
standard inspect module in Python autodoc unit test to ignore the differences
in their indentation level between -builtin and non-builtin cases to make the
test still pass with the branch version, which avoids the use of different
(but almost identical) values in the test itself.
Diffstat (limited to 'Source/Makefile.am')
| -rw-r--r-- | Source/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/Makefile.am b/Source/Makefile.am index 84dc05458..b1d6359b0 100644 --- a/Source/Makefile.am +++ b/Source/Makefile.am @@ -47,6 +47,7 @@ eswig_SOURCES = CParse/cscanner.c \ Modules/emit.cxx \ Modules/go.cxx \ Modules/guile.cxx \ + Modules/interface.cxx \ Modules/java.cxx \ Modules/javascript.cxx \ Modules/lang.cxx \ @@ -61,6 +62,7 @@ eswig_SOURCES = CParse/cscanner.c \ Modules/overload.cxx \ Modules/perl5.cxx \ Modules/php.cxx \ + Modules/php5.cxx \ Modules/pike.cxx \ Modules/python.cxx \ Modules/r.cxx \ |