summaryrefslogtreecommitdiff
path: root/Source/Makefile.am
diff options
context:
space:
mode:
authorVadim Zeitlin <vz-swig@zeitlins.org>2014-06-11 02:21:43 +0200
committerVadim Zeitlin <vz-swig@zeitlins.org>2014-08-13 16:11:21 +0200
commit6cce652762aeef837df441ac6ecc588fe0efcf29 (patch)
tree022d32ccb4a32624305d3a2eae3e2a45c4f0e1be /Source/Makefile.am
parentf6ba7b91487fec619a75d3421619bae90ce0fc94 (diff)
parent8d226e39dc7a958013ff9ffd15e231ef206ba265 (diff)
downloadswig-6cce652762aeef837df441ac6ecc588fe0efcf29.tar.gz
Merge latest master into doxygen branch again.
Update Doxygen-specific Python unit tests to work with the new indentation. Update one of Doxygen-specific Java tests to still build with the new handling of srcdir.
Diffstat (limited to 'Source/Makefile.am')
-rw-r--r--Source/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Makefile.am b/Source/Makefile.am
index 824f93ac8..8f64db9ec 100644
--- a/Source/Makefile.am
+++ b/Source/Makefile.am
@@ -77,6 +77,7 @@ eswig_SOURCES = CParse/cscanner.c \
Swig/cwrap.c \
Swig/deprecate.c \
Swig/error.c \
+ Swig/extend.c \
Swig/fragment.c \
Swig/getopt.c \
Swig/include.c \