Mercurial > hg > libxtract

changeset 218:49079e689a89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix conflict with Makefile.am for SWIG bindings and autotools
author Jamie Bullock <jamie@jamiebullock.com>
date Wed, 04 Jun 2014 14:15:03 +0100
parents 66f8547eb796
children eb2ab9b70c29
files swig/java/Makefile.am swig/python/Makefile.am
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/swig/java/Makefile.am	Wed Jun 04 14:14:27 2014 +0100
+++ b/swig/java/Makefile.am	Wed Jun 04 14:15:03 2014 +0100
@@ -64,11 +64,11 @@
 	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
--- a/swig/python/Makefile.am	Wed Jun 04 14:14:27 2014 +0100
+++ b/swig/python/Makefile.am	Wed Jun 04 14:15:03 2014 +0100
@@ -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