Simplify 'libiphone.iPhone' module to 'iphone'

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 */