summaryrefslogtreecommitdiff
path: root/plugins/itanium/python
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/itanium/python')
-rw-r--r--plugins/itanium/python/Makefile.am13
-rw-r--r--plugins/itanium/python/demangler.c10
2 files changed, 10 insertions, 13 deletions
diff --git a/plugins/itanium/python/Makefile.am b/plugins/itanium/python/Makefile.am
index b0a3da1..a00bda8 100644
--- a/plugins/itanium/python/Makefile.am
+++ b/plugins/itanium/python/Makefile.am
@@ -1,19 +1,14 @@
noinst_LTLIBRARIES = libitaniumpython.la
-libitaniumpython_la_SOURCES = \
- demangler.h demangler.c \
+libitaniumpython_la_SOURCES = \
+ demangler.h demangler.c \
module.h module.c
-libitaniumpython_la_LDFLAGS =
+libitaniumpython_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+ -I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
devdir = $(includedir)/chrysalide/$(subdir)
dev_HEADERS = $(libitaniumpython_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
- -I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/itanium/python/demangler.c b/plugins/itanium/python/demangler.c
index 5819ac4..12cc6c5 100644
--- a/plugins/itanium/python/demangler.c
+++ b/plugins/itanium/python/demangler.c
@@ -140,15 +140,17 @@ PyTypeObject *get_python_itanium_demangler_type(void)
bool register_python_itanium_demangler(PyObject *module)
{
- PyTypeObject *py_itanium_demangler_type;/* Type 'ItaniumDemangler' */
+ PyTypeObject *type; /* Type 'ItaniumDemangler' */
PyObject *dict; /* Dictionnaire du module */
- py_itanium_demangler_type = get_python_itanium_demangler_type();
+ type = get_python_itanium_demangler_type();
dict = PyModule_GetDict(module);
- if (!register_class_for_pygobject(dict, G_TYPE_ITANIUM_DEMANGLER,
- py_itanium_demangler_type, get_python_compiler_demangler_type()))
+ if (!ensure_python_compiler_demangler_is_registered())
+ return false;
+
+ if (!register_class_for_pygobject(dict, G_TYPE_ITANIUM_DEMANGLER, type))
return false;
return true;