Merge branch 'master' of git://github.com/MattColyer/libiphone into martin

1 files changed, 20 insertions, 7 deletions

diff --git a/swig/Makefile.am b/swig/Makefile.am
index 7f88b40..726014b 100644
--- a/swig/Makefile.am
+++ b/swig/Makefile.am
@@ -1,18 +1,31 @@
 INCLUDES = -I$(top_srcdir)/include  $(libplist_CFLAGS) -I$(includedir)
 
-BUILT_SOURCES = $(srcdir)/iphone_wrap.c
+BUILT_SOURCES = iphone_wrap.c
 SWIG_SOURCES = iphone.i
 
+CLEANFILES =                \
+        *.pyc               \
+        *.pyo               \
+        _iPhone.so          \
+        iPhone.py           \
+        iphone_wrap.c
+
+EXTRA_DIST =                \
+        __init__.py         \
+        iphone.i
+
 swigincludedir =$(includedir)/libiphone/swig
 swiginclude_HEADERS = $(SWIG_SOURCES)
 
-pkgpython_PYTHON = iPhone.py __init__.py
-pkgpyexec_LTLIBRARIES = _iPhone.la
-_iPhone_la_SOURCES = $(srcdir)/iphone_wrap.c $(SWIG_SOURCES)
+iPhonedir = $(pyexecdir)/libiphone
+iPhone_PYTHON = __init__.py
+nodist_iPhone_PYTHON = iPhone.py
+iPhone_LTLIBRARIES = _iPhone.la
+nodist__iPhone_la_SOURCES = iphone_wrap.c $(SWIG_SOURCES)
 _iPhone_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src
-_iPhone_la_LDFLAGS = -module $(PYTHON_LDFLAGS)
-_iPhone_la_LIBADD = ../src/libiphone.la
+_iPhone_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
+_iPhone_la_LIBADD = $(top_builddir)/src/libiphone.la
 
-$(srcdir)/iphone_wrap.c : $(SWIG_SOURCES)
+iphone_wrap.c : $(SWIG_SOURCES)
         $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $<