3 files changed, 15 insertions, 4 deletions
diff --git a/swig/java/Makefile.am b/swig/java/Makefile.am
index e45d297..8205201 100644
--- a/swig/java/Makefile.am
+++ b/swig/java/Makefile.am
@@ -64,11 +64,11 @@ javaclasses = \
 	xtract_vector_t.class \
 	xtract_window_types_.class 
 
-BUILT_SOURCES = $(srcdir)/xtract_wrap.c
+BUILT_SOURCES = xtract_wrap.c
 SWIG_SOURCES = jxtract.i
 
 lib_LTLIBRARIES = libjxtract.la
-libjxtract_la_SOURCES = $(srcdir)/xtract_wrap.c $(SWIG_SOURCES)
+libjxtract_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES)
 libjxtract_la_CFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
 libjxtract_la_LDFLAGS = -lxtract
 libjxtract_la_LIBADD = $(top_srcdir)/src/libxtract.la
diff --git a/swig/python/Makefile.am b/swig/python/Makefile.am
index 92f8b00..833c2f3 100644
--- a/swig/python/Makefile.am
+++ b/swig/python/Makefile.am
@@ -1,11 +1,11 @@
 MAINTAINERCLEANFILES = xtract.py xtract_wrap.c Makefile.in _xtract.so
 
-BUILT_SOURCES = $(srcdir)/xtract_wrap.c
+BUILT_SOURCES = xtract_wrap.c
 SWIG_SOURCES = ../xtract.i
 
 pkgpython_PYTHON = xtract.py __init__.py
 pkgpyexec_LTLIBRARIES = _xtract.la
-_xtract_la_SOURCES = $(srcdir)/xtract_wrap.c $(SWIG_SOURCES)
+_xtract_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES)
 _xtract_la_CFLAGS = $(AX_SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
 _xtract_la_LDFLAGS = -module
 _xtract_la_LIBADD = $(top_srcdir)/src/libxtract.la
diff --git a/swig/xtract.i b/swig/xtract.i
index 226aa2b..49169c0 100644
--- a/swig/xtract.i
+++ b/swig/xtract.i
@@ -3,6 +3,7 @@
 #ifndef SWIGJAVA
 %include carrays.i
 #endif
+%include stdint.i
 
 %{
 #include "xtract/xtract_scalar.h"
@@ -10,9 +11,11 @@
 #include "xtract/xtract_helper.h"
 #include "xtract/xtract_macros.h"
 #include "xtract/xtract_delta.h"
+#include "xtract/xtract_stateful.h"
 #include "xtract/libxtract.h"
 %}
 
+
 /* Helper functions */
 %inline %{
 
@@ -78,6 +81,12 @@
 
 %ignore xtract;
 
+/* For now ignore stateful functions */
+%ignore xtract_last_n;
+%ignore xtract_last_n_state_new;
+%ignore xtract_last_n_state_delete;
+
+
 %include "xtract/xtract_scalar.h"
 
 /* We have to put xtract_delta declarations inline because it contains a mixture of vector and scalar functions */
@@ -96,7 +105,9 @@
 
 %}
 
+
 %include "xtract/xtract_vector.h"
+%include "xtract/xtract_stateful.h"
 %include "xtract/xtract_helper.h"
 %include "xtract/xtract_macros.h"
 %include "xtract/libxtract.h"