6 files changed, 25 insertions, 26 deletions
diff --git a/plugins/dalvik/python/Makefile.am b/plugins/dalvik/python/Makefile.am
index 90c8924..74fe00d 100644
--- a/plugins/dalvik/python/Makefile.am
+++ b/plugins/dalvik/python/Makefile.am
@@ -1,15 +1,16 @@
 
 noinst_LTLIBRARIES = libdalvikpython.la
 
-libdalvikpython_la_SOURCES =			\
-	instruction.h instruction.c			\
-	module.h module.c					\
+libdalvikpython_la_SOURCES =				\
+	instruction.h instruction.c				\
+	module.h module.c						\
 	processor.h processor.c
 
-libdalvikpython_la_LIBADD =				\
+libdalvikpython_la_LIBADD =					\
 	v35/libdalvikpythonv35.la
 
-libdalvikpython_la_LDFLAGS = 
+libdalvikpython_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
@@ -17,9 +18,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libdalvikpython_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)
-
 SUBDIRS = v35
diff --git a/plugins/dalvik/python/instruction.c b/plugins/dalvik/python/instruction.c
index c9d039f..a6d4ad4 100644
--- a/plugins/dalvik/python/instruction.c
+++ b/plugins/dalvik/python/instruction.c
@@ -102,7 +102,10 @@ bool register_python_dalvik_instruction(PyObject *module)
 
     dict = PyModule_GetDict(module);
 
-    if (!register_class_for_pygobject(dict, G_TYPE_DALVIK_INSTRUCTION, type, get_python_arch_instruction_type()))
+    if (!ensure_python_arch_instruction_is_registered())
+        return false;
+
+    if (!register_class_for_pygobject(dict, G_TYPE_DALVIK_INSTRUCTION, type))
         return false;
 
     return true;
diff --git a/plugins/dalvik/python/processor.c b/plugins/dalvik/python/processor.c
index 26fd8b7..9885a04 100644
--- a/plugins/dalvik/python/processor.c
+++ b/plugins/dalvik/python/processor.c
@@ -100,7 +100,10 @@ bool register_python_dalvik_processor(PyObject *module)
 
     dict = PyModule_GetDict(module);
 
-    if (!register_class_for_pygobject(dict, G_TYPE_DALVIK_PROCESSOR, type, get_python_arch_processor_type()))
+    if (!ensure_python_arch_processor_is_registered())
+        return false;
+
+    if (!register_class_for_pygobject(dict, G_TYPE_DALVIK_PROCESSOR, type))
         return false;
 
     return true;
diff --git a/plugins/dalvik/python/v35/Makefile.am b/plugins/dalvik/python/v35/Makefile.am
index 3dda5c1..4464dcc 100644
--- a/plugins/dalvik/python/v35/Makefile.am
+++ b/plugins/dalvik/python/v35/Makefile.am
@@ -1,20 +1,15 @@
 
 noinst_LTLIBRARIES = libdalvikpythonv35.la
 
-libdalvikpythonv35_la_SOURCES =			\
-	instruction.h instruction.c			\
-	module.h module.c					\
+libdalvikpythonv35_la_SOURCES =				\
+	instruction.h instruction.c				\
+	module.h module.c						\
 	processor.h processor.c
 
-libdalvikpythonv35_la_LDFLAGS = 
+libdalvikpythonv35_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvikpythonv35_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/dalvik/python/v35/instruction.c b/plugins/dalvik/python/v35/instruction.c
index f5ccc2c..7373e77 100644
--- a/plugins/dalvik/python/v35/instruction.c
+++ b/plugins/dalvik/python/v35/instruction.c
@@ -100,8 +100,9 @@ bool register_python_dalvik35_instruction(PyObject *module)
 
     dict = PyModule_GetDict(module);
 
-    if (!register_class_for_pygobject(dict, G_TYPE_DALVIK35_INSTRUCTION,
-                                  type, get_python_dalvik_instruction_type()))
+    /* TODO : ensure get_python_dalvik_instruction_type() */
+
+    if (!register_class_for_pygobject(dict, G_TYPE_DALVIK35_INSTRUCTION, type))
         return false;
 
     return true;
diff --git a/plugins/dalvik/python/v35/processor.c b/plugins/dalvik/python/v35/processor.c
index fea342b..8df8249 100644
--- a/plugins/dalvik/python/v35/processor.c
+++ b/plugins/dalvik/python/v35/processor.c
@@ -100,8 +100,9 @@ bool register_python_dalvik35_processor(PyObject *module)
 
     dict = PyModule_GetDict(module);
 
-    if (!register_class_for_pygobject(dict, G_TYPE_DALVIK35_PROCESSOR,
-                                      type, get_python_dalvik_processor_type()))
+    /* TODO : ensure get_python_dalvik_processor_type() */
+
+    if (!register_class_for_pygobject(dict, G_TYPE_DALVIK35_PROCESSOR, type))
         return false;
 
     return true;