summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jonathan Beck2009-11-11 22:07:28 +0100
committerGravatar Matt Colyer2009-11-12 10:57:12 -0800
commit1ccc8762a6564348b775a5038c16b3566114f2eb (patch)
treec6fd44a42ad7c4d2b52eae09207bc6f751a425b5
parent28d1fcac0eda09e829ef8c8b46fad0e45590af16 (diff)
downloadlibimobiledevice-1ccc8762a6564348b775a5038c16b3566114f2eb.tar.gz
libimobiledevice-1ccc8762a6564348b775a5038c16b3566114f2eb.tar.bz2
Simplify 'libiphone.iPhone' module to 'iphone'
-rw-r--r--swig/Makefile.am24
-rw-r--r--swig/__init__.py3
-rw-r--r--swig/iphone.i2
3 files changed, 15 insertions, 14 deletions
diff --git a/swig/Makefile.am b/swig/Makefile.am
index 0da739b..580158d 100644
--- a/swig/Makefile.am
+++ b/swig/Makefile.am
@@ -6,26 +6,26 @@ SWIG_SOURCES = iphone.i
CLEANFILES = \
*.pyc \
*.pyo \
- _iPhone.so \
- iPhone.py \
+ _iphone.so \
+ iphone.py \
iphone_wrap.cxx
EXTRA_DIST = \
__init__.py \
- iphone.i
+ iphone.i
swigincludedir =$(includedir)/libiphone/swig
swiginclude_HEADERS = $(SWIG_SOURCES)
-iPhonedir = $(pyexecdir)/libiphone
-iPhone_PYTHON = __init__.py
-nodist_iPhone_PYTHON = iPhone.py
-iPhone_LTLIBRARIES = _iPhone.la
-nodist__iPhone_la_SOURCES = iphone_wrap.cxx $(SWIG_SOURCES)
-_iPhone_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src
-_iPhone_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
-_iPhone_la_LIBADD = $(top_builddir)/src/libiphone.la $(libplistmm_LIBS)
+iphonedir = $(pyexecdir)/iphone
+iphone_PYTHON = __init__.py
+nodist_iphone_PYTHON = iphone.py
+iphone_LTLIBRARIES = _iphone.la
+nodist__iphone_la_SOURCES = iphone_wrap.cxx $(SWIG_SOURCES)
+_iphone_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src
+_iphone_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
+_iphone_la_LIBADD = $(top_builddir)/src/libiphone.la $(libplistmm_LIBS)
iphone_wrap.cxx : $(SWIG_SOURCES)
- $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $<
+ $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $<
diff --git a/swig/__init__.py b/swig/__init__.py
index 8d1c8b6..e70dcce 100644
--- a/swig/__init__.py
+++ b/swig/__init__.py
@@ -1 +1,2 @@
-
+# -*- coding: utf-8 -*-
+from iphone import *
diff --git a/swig/iphone.i b/swig/iphone.i
index 6604c63..a0ee509 100644
--- a/swig/iphone.i
+++ b/swig/iphone.i
@@ -1,5 +1,5 @@
/* swig.i */
- %module(package="libiphone") iPhone
+ %module iphone
%feature("autodoc", "1");
%{
/* Includes the header in the wrapper code */