10 files changed, 49 insertions, 80 deletions
diff --git a/plugins/dalvik/Makefile.am b/plugins/dalvik/Makefile.am
index 644c38a..62ee8a6 100644
--- a/plugins/dalvik/Makefile.am
+++ b/plugins/dalvik/Makefile.am
@@ -39,26 +39,28 @@ PYTHON3_SUBDIRS = python
 endif
 
 
-libdalvik_la_SOURCES =					\
-	context.h context.c					\
-	core.h core.c						\
-	fetch.h fetch.c						\
-	helpers.h							\
-	instruction-int.h					\
-	instruction.h instruction.c			\
-	link.h link.c						\
-	operand.h operand.c					\
-	post.h post.c						\
-	processor-int.h						\
-	processor.h processor.c				\
+libdalvik_la_SOURCES =						\
+	context.h context.c						\
+	core.h core.c							\
+	fetch.h fetch.c							\
+	helpers.h								\
+	instruction-int.h						\
+	instruction.h instruction.c				\
+	link.h link.c							\
+	operand.h operand.c						\
+	post.h post.c							\
+	processor-int.h							\
+	processor.h processor.c					\
 	register.h register.c
 
-libdalvik_la_LIBADD =					\
-	operands/libdalvikoperands.la		\
-	pseudo/libdalvikpseudo.la			\
-	$(PYTHON3_LIBADD)					\
+libdalvik_la_LIBADD =						\
+	operands/libdalvikoperands.la			\
+	pseudo/libdalvikpseudo.la				\
+	$(PYTHON3_LIBADD)						\
 	v35/libdalvik35.la
 
+libdalvik_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
 libdalvik_la_LDFLAGS =						\
 	-avoid-version							\
 	-L$(top_srcdir)/src/.libs -lchrysacore	\
@@ -71,9 +73,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libdalvik_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
 SUBDIRS = operands pseudo $(PYTHON3_SUBDIRS) v35
diff --git a/plugins/dalvik/operands/Makefile.am b/plugins/dalvik/operands/Makefile.am
index 4ce597a..3a4ddc1 100644
--- a/plugins/dalvik/operands/Makefile.am
+++ b/plugins/dalvik/operands/Makefile.am
@@ -1,20 +1,14 @@
 
 noinst_LTLIBRARIES = libdalvikoperands.la
 
-libdalvikoperands_la_SOURCES =			\
-	args.h args.c						\
-	pool.h pool.c						\
+libdalvikoperands_la_SOURCES =				\
+	args.h args.c							\
+	pool.h pool.c							\
 	register.h register.c
 
+libdalvikoperands_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvikoperands_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
-SUBDIRS = 
diff --git a/plugins/dalvik/operands/args.c b/plugins/dalvik/operands/args.c
index 01ed122..64f8eea 100644
--- a/plugins/dalvik/operands/args.c
+++ b/plugins/dalvik/operands/args.c
@@ -32,8 +32,8 @@
 
 #include <arch/operand-int.h>
 #include <common/sort.h>
+#include <core/columns.h>
 #include <core/logs.h>
-#include <gtkext/gtkblockdisplay.h>
 
 
 
diff --git a/plugins/dalvik/operands/pool.c b/plugins/dalvik/operands/pool.c
index a07b3e0..5b99b45 100644
--- a/plugins/dalvik/operands/pool.c
+++ b/plugins/dalvik/operands/pool.c
@@ -34,7 +34,7 @@
 #include <arch/operand-int.h>
 #include <arch/operands/targetable-int.h>
 #include <common/sort.h>
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 #include <plugins/dex/pool.h>
 
 
diff --git a/plugins/dalvik/pseudo/Makefile.am b/plugins/dalvik/pseudo/Makefile.am
index 687aa72..74cc574 100644
--- a/plugins/dalvik/pseudo/Makefile.am
+++ b/plugins/dalvik/pseudo/Makefile.am
@@ -1,19 +1,14 @@
 
 noinst_LTLIBRARIES = libdalvikpseudo.la
 
-libdalvikpseudo_la_SOURCES =			\
-	fill.h fill.c						\
-	identifiers.h						\
+libdalvikpseudo_la_SOURCES =				\
+	fill.h fill.c							\
+	identifiers.h							\
 	switch.h switch.c
 
-libdalvikpseudo_la_LIBADD = 
+libdalvikpseudo_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdalvikpseudo_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
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/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/register.c b/plugins/dalvik/register.c
index b350b04..8413108 100644
--- a/plugins/dalvik/register.c
+++ b/plugins/dalvik/register.c
@@ -30,7 +30,7 @@
 
 #include <arch/register-int.h>
 #include <common/sort.h>
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 
diff --git a/plugins/dalvik/v35/Makefile.am b/plugins/dalvik/v35/Makefile.am
index 8a7be09..73e09a0 100644
--- a/plugins/dalvik/v35/Makefile.am
+++ b/plugins/dalvik/v35/Makefile.am
@@ -1,13 +1,15 @@
 
 noinst_LTLIBRARIES = libdalvik35.la
 
-libdalvik35_la_SOURCES =				\
-	core.h core.c						\
-	instruction.h instruction.c			\
-	operand.h							\
+libdalvik35_la_SOURCES =					\
+	core.h core.c							\
+	instruction.h instruction.c				\
+	operand.h								\
 	processor.h processor.c
 
-libdalvik35_la_LIBADD =					\
+libdalvik35_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
+libdalvik35_la_LIBADD =						\
 	opcodes/libdalvik35opcodes.la
 
 
@@ -16,9 +18,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libdalvik35_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
 SUBDIRS = opdefs opcodes
diff --git a/plugins/dalvik/v35/opcodes/Makefile.am b/plugins/dalvik/v35/opcodes/Makefile.am
index fd26224..8a766f9 100644
--- a/plugins/dalvik/v35/opcodes/Makefile.am
+++ b/plugins/dalvik/v35/opcodes/Makefile.am
@@ -13,7 +13,7 @@ noinst_LTLIBRARIES = libdalvik35opcodes.la
 
 libdalvik35opcodes_la_SOURCES = $(GENERATED_FILES)
 
-libdalvik35opcodes_la_LIBADD =
+libdalvik35opcodes_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
@@ -21,11 +21,6 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libdalvik35opcodes_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
 CLEANFILES = $(GENERATED_FILES)
 
 dist-hook: