diff options
| author | Jamie Bullock <jamie@jamiebullock.com> | 2014-06-04 14:15:03 +0100 |
|---|---|---|
| committer | Jamie Bullock <jamie@jamiebullock.com> | 2014-06-04 14:15:03 +0100 |
| commit | 2be3394e17cd86932a1658b0e1683fe876943f21 (patch) | |
| tree | 9ee674eb47c9415a6df3d055f994305e272422fb | |
| parent | 8f17a8b59b36f261ac90fe048fa55c1d56b66ea6 (diff) | |
| download | LibXtract-2be3394e17cd86932a1658b0e1683fe876943f21.tar.gz LibXtract-2be3394e17cd86932a1658b0e1683fe876943f21.tar.bz2 LibXtract-2be3394e17cd86932a1658b0e1683fe876943f21.zip | |
Fix conflict with Makefile.am for SWIG bindings and autotools
| -rw-r--r-- | swig/java/Makefile.am | 4 | ||||
| -rw-r--r-- | swig/python/Makefile.am | 4 |
2 files changed, 4 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 |