From c5a67e529afd60c247f3ccec1e078ff5567e64ea Mon Sep 17 00:00:00 2001 From: Michael Sheldon Date: Thu, 26 Feb 2009 19:59:52 +0200 Subject: [PATCH] Fix up the bindings a little --- bindings/python/champlain-gtk/Makefile.am | 9 ++++--- .../champlain-gtk/pychamplaingtkmodule.c | 26 +++++++++++++++++++ configure.ac | 1 + 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 bindings/python/champlain-gtk/pychamplaingtkmodule.c diff --git a/bindings/python/champlain-gtk/Makefile.am b/bindings/python/champlain-gtk/Makefile.am index e231aa2..f620a53 100644 --- a/bindings/python/champlain-gtk/Makefile.am +++ b/bindings/python/champlain-gtk/Makefile.am @@ -14,17 +14,18 @@ BUILT_SOURCES = \ pychamplaingtk.c pychamplaingtkdir = $(pyexecdir) -pychamplaingtk_LTLIBRARIES = champlain-gtk.la +pychamplaingtk_LTLIBRARIES = champlaingtk.la -champlain_gtk_la_SOURCES = \ +champlaingtk_la_SOURCES = \ + pychamplaingtkmodule.c \ pychamplaingtk.c -champlain_gtk_la_LIBADD = \ +champlaingtk_la_LIBADD = \ $(PYTHON_BINDING_LIBS) \ $(top_builddir)/champlain/libchamplain-0.3.la \ $(top_builddir)/champlain-gtk/libchamplain-gtk-0.3.la -champlain_gtk_la_LDFLAGS = \ +champlaingtk_la_LDFLAGS = \ -module -avoid-version pychamplaingtk.c: pychamplaingtk.override pychamplaingtk.defs diff --git a/bindings/python/champlain-gtk/pychamplaingtkmodule.c b/bindings/python/champlain-gtk/pychamplaingtkmodule.c new file mode 100644 index 0000000..c4ba665 --- /dev/null +++ b/bindings/python/champlain-gtk/pychamplaingtkmodule.c @@ -0,0 +1,26 @@ +#define NO_IMPORT_PYGOBJECT + +#include + +void champlain_register_classes (PyObject *d); +DL_EXPORT(void) initchamplaingtk(void); +extern PyMethodDef champlain_functions[]; + +DL_EXPORT(void) +initchamplaingtk(void) +{ + PyObject *m, *d; + + init_pygobject (); + + m = Py_InitModule ("champlaingtk", champlain_functions); + d = PyModule_GetDict (m); + + champlain_register_classes (d); + + if (PyErr_Occurred ()) { + PyErr_Print(); + Py_FatalError ("can't initialise module champlaingtk"); + } +} + diff --git a/configure.ac b/configure.ac index cd3f6d1..b39a6fb 100644 --- a/configure.ac +++ b/configure.ac @@ -150,6 +150,7 @@ if test x$enable_python = xyes; then PKG_CHECK_MODULES(PYTHON_BINDING, [ pygtk-2.0, + pygobject-2.0, glib-2.0, gobject-2.0, clutter-0.8, -- 2.39.5