3 files changed, 9 insertions, 18 deletions
diff --git a/plugins/pychrysalide/arch/instructions/Makefile.am b/plugins/pychrysalide/arch/instructions/Makefile.am
index 01c22c4..65efe42 100644
--- a/plugins/pychrysalide/arch/instructions/Makefile.am
+++ b/plugins/pychrysalide/arch/instructions/Makefile.am
@@ -2,24 +2,15 @@
 noinst_LTLIBRARIES = libpychrysaarchinstructions.la
 
 libpychrysaarchinstructions_la_SOURCES =	\
-	constants.h constants.c				\
-	module.h module.c					\
-	raw.h raw.c							\
+	constants.h constants.c					\
+	module.h module.c						\
+	raw.h raw.c								\
 	undefined.h undefined.c
 
-libpychrysaarchinstructions_la_LIBADD = 
-
-libpychrysaarchinstructions_la_LDFLAGS = 
+libpychrysaarchinstructions_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaarchinstructions_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/arch/instructions/raw.c b/plugins/pychrysalide/arch/instructions/raw.c
index c1366c6..7e58b96 100644
--- a/plugins/pychrysalide/arch/instructions/raw.c
+++ b/plugins/pychrysalide/arch/instructions/raw.c
@@ -99,7 +99,7 @@ static PyObject *py_raw_instruction_new(PyTypeObject *type, PyObject *args, PyOb
 
     if (first_time)
     {
-        status = register_class_for_dynamic_pygobject(gtype, type, base);
+        status = register_class_for_dynamic_pygobject(gtype, type);
 
         if (!status)
         {
@@ -458,7 +458,7 @@ bool ensure_python_raw_instruction_is_registered(void)
         if (!ensure_python_arch_instruction_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_RAW_INSTRUCTION, type, get_python_arch_instruction_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_RAW_INSTRUCTION, type))
             return false;
 
         if (!define_raw_instruction_constants(type))
diff --git a/plugins/pychrysalide/arch/instructions/undefined.c b/plugins/pychrysalide/arch/instructions/undefined.c
index 99fd2ff..1246daa 100644
--- a/plugins/pychrysalide/arch/instructions/undefined.c
+++ b/plugins/pychrysalide/arch/instructions/undefined.c
@@ -88,7 +88,7 @@ static PyObject *py_undef_instruction_new(PyTypeObject *type, PyObject *args, Py
 
     if (first_time)
     {
-        status = register_class_for_dynamic_pygobject(gtype, type, base);
+        status = register_class_for_dynamic_pygobject(gtype, type);
 
         if (!status)
         {
@@ -285,7 +285,7 @@ bool ensure_python_undefined_instruction_is_registered(void)
         if (!ensure_python_arch_instruction_is_registered())
             return false;
 
-        if (!register_class_for_pygobject(dict, G_TYPE_UNDEF_INSTRUCTION, type, get_python_arch_instruction_type()))
+        if (!register_class_for_pygobject(dict, G_TYPE_UNDEF_INSTRUCTION, type))
             return false;
 
         if (!define_undefined_instruction_constants(type))