From f56e085ba3d74f595c7708047dd082ef31e828cd Mon Sep 17 00:00:00 2001
From: Todd Zullinger
Date: Sun, 10 May 2009 22:53:57 -0400
Subject: Fix 'make distcheck' for python bindings

This should also make the python bindings install in the correct
location on 64-bit architectures.

Signed-off-by: Matt Colyer <matt@colyer.name>
---
 swig/Makefile.am | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'swig')

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 $@ $<
 
-- 
cgit v1.1-32-gdbae


From 9e59d5ad283d7ff8d22ec224b6a144edfa6adba5 Mon Sep 17 00:00:00 2001
From: Todd Zullinger
Date: Sun, 10 May 2009 22:53:58 -0400
Subject: Drop plist/ prefix from libplist includes

If this works, the libplist.pc file would need reworking.  The problem
seems to be that pkg-config excludes /usr/include from libgpod_CFLAGS.

Signed-off-by: Matt Colyer <matt@colyer.name>
---
 swig/iphone.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'swig')

diff --git a/swig/iphone.i b/swig/iphone.i
index ae2e97f..bf66352 100644
--- a/swig/iphone.i
+++ b/swig/iphone.i
@@ -4,7 +4,7 @@
  %{
  /* Includes the header in the wrapper code */
  #include <libiphone/libiphone.h>
- #include <plist/plist.h>
+ #include <plist.h>
 #include "../src/utils.h"
  typedef struct {
 	iphone_device_t dev;
@@ -29,7 +29,7 @@ MobileSync* my_new_MobileSync(Lockdownd* lckd);
  %}
 /* Parse the header file to generate wrappers */
 %include "stdint.i"
-%include "plist/swig/plist.i"
+%include "swig/plist.i"
 
 #define DBGMASK_ALL        0xFFFF
 #define DBGMASK_NONE       0x0000
-- 
cgit v1.1-32-gdbae


From 6c25d6104412dcbbc50096878c69f648aeae345d Mon Sep 17 00:00:00 2001
From: Matt Colyer
Date: Mon, 11 May 2009 08:16:22 -0700
Subject: Revert the last patch as it breaks rather than helps (on my system
 atleast)

---
 swig/iphone.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'swig')

diff --git a/swig/iphone.i b/swig/iphone.i
index bf66352..ae2e97f 100644
--- a/swig/iphone.i
+++ b/swig/iphone.i
@@ -4,7 +4,7 @@
  %{
  /* Includes the header in the wrapper code */
  #include <libiphone/libiphone.h>
- #include <plist.h>
+ #include <plist/plist.h>
 #include "../src/utils.h"
  typedef struct {
 	iphone_device_t dev;
@@ -29,7 +29,7 @@ MobileSync* my_new_MobileSync(Lockdownd* lckd);
  %}
 /* Parse the header file to generate wrappers */
 %include "stdint.i"
-%include "swig/plist.i"
+%include "plist/swig/plist.i"
 
 #define DBGMASK_ALL        0xFFFF
 #define DBGMASK_NONE       0x0000
-- 
cgit v1.1-32-gdbae