Refactor Makefiles to exclude GTK on demand.

22 files changed, 80 insertions, 110 deletions

diff --git a/plugins/arm/Makefile.am b/plugins/arm/Makefile.am
index a37cbbd..3470256 100644
--- a/plugins/arm/Makefile.am
+++ b/plugins/arm/Makefile.am
@@ -35,23 +35,25 @@ PYTHON3_SUBDIRS = python
 endif
 
 
-libarm_la_SOURCES =						\
-	cond.h								\
-	context-int.h						\
-	context.h context.c					\
-	core.h core.c						\
-	instruction-int.h					\
-	instruction.h instruction.c			\
-	link.h link.c						\
-	processor-int.h						\
-	processor.h processor.c				\
-	register-int.h						\
+libarm_la_SOURCES =							\
+	cond.h									\
+	context-int.h							\
+	context.h context.c						\
+	core.h core.c							\
+	instruction-int.h						\
+	instruction.h instruction.c				\
+	link.h link.c							\
+	processor-int.h							\
+	processor.h processor.c					\
+	register-int.h							\
 	register.h register.c
 
-libarm_la_LIBADD =						\
-	$(PYTHON3_LIBADD)					\
+libarm_la_LIBADD =							\
+	$(PYTHON3_LIBADD)						\
 	v7/libarmv7.la
 
+libarm_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
 libarm_la_LDFLAGS =							\
 	-avoid-version							\
 	-L$(top_srcdir)/src/.libs -lchrysacore	\
@@ -63,9 +65,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libarm_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
 SUBDIRS = v7 $(PYTHON3_SUBDIRS)
diff --git a/plugins/arm/python/Makefile.am b/plugins/arm/python/Makefile.am
index f09baee..931b2b9 100644
--- a/plugins/arm/python/Makefile.am
+++ b/plugins/arm/python/Makefile.am
@@ -1,15 +1,16 @@
 
 noinst_LTLIBRARIES = libarmpython.la
 
-libarmpython_la_SOURCES =				\
-	instruction.h instruction.c			\
-	module.h module.c					\
+libarmpython_la_SOURCES =					\
+	instruction.h instruction.c				\
+	module.h module.c						\
 	processor.h processor.c
 
-libarmpython_la_LIBADD =				\
+libarmpython_la_LIBADD =					\
 	v7/libarmpythonv7.la
 
-libarmpython_la_LDFLAGS = 
+libarmpython_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 = $(libarmpython_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 = v7
diff --git a/plugins/arm/python/v7/Makefile.am b/plugins/arm/python/v7/Makefile.am
index 06dc4af..a350d90 100644
--- a/plugins/arm/python/v7/Makefile.am
+++ b/plugins/arm/python/v7/Makefile.am
@@ -1,20 +1,15 @@
 
 noinst_LTLIBRARIES = libarmpythonv7.la
 
-libarmpythonv7_la_SOURCES =				\
-	instruction.h instruction.c			\
-	module.h module.c					\
+libarmpythonv7_la_SOURCES =					\
+	instruction.h instruction.c				\
+	module.h module.c						\
 	processor.h processor.c
 
-libarmpythonv7_la_LDFLAGS = 
+libarmpythonv7_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmpythonv7_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/arm/v7/Makefile.am b/plugins/arm/v7/Makefile.am
index f75e9b3..d87373a 100644
--- a/plugins/arm/v7/Makefile.am
+++ b/plugins/arm/v7/Makefile.am
@@ -1,38 +1,35 @@
 
 noinst_LTLIBRARIES = libarmv7.la
 
-libarmv7_la_SOURCES =					\
-	arm.h arm.c							\
-	context.h context.c					\
-	core.h core.c						\
-	fetch.h fetch.c						\
-	helpers.h							\
-	instruction.h instruction.c			\
-	link.h link.c						\
-	operand-int.h						\
-	operand.h operand.c					\
-	post.h post.c						\
-	processor.h processor.c				\
-	pseudo.h pseudo.c					\
-	register-int.h						\
-	register.h register.c				\
-	thumb_16.h thumb_16.c				\
+libarmv7_la_SOURCES =						\
+	arm.h arm.c								\
+	context.h context.c						\
+	core.h core.c							\
+	fetch.h fetch.c							\
+	helpers.h								\
+	instruction.h instruction.c				\
+	link.h link.c							\
+	operand-int.h							\
+	operand.h operand.c						\
+	post.h post.c							\
+	processor.h processor.c					\
+	pseudo.h pseudo.c						\
+	register-int.h							\
+	register.h register.c					\
+	thumb_16.h thumb_16.c					\
 	thumb_32.h thumb_32.c
 
-libarmv7_la_LIBADD =					\
-	opcodes/libarmv7opcodes.la			\
-	operands/libarmv7operands.la		\
+libarmv7_la_LIBADD =						\
+	opcodes/libarmv7opcodes.la				\
+	operands/libarmv7operands.la			\
 	registers/libarmv7registers.la
 
+libarmv7_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmv7_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
 SUBDIRS = opdefs opcodes operands registers
diff --git a/plugins/arm/v7/opcodes/Makefile.am b/plugins/arm/v7/opcodes/Makefile.am
index 7a35ff9..c7fa4cc 100644
--- a/plugins/arm/v7/opcodes/Makefile.am
+++ b/plugins/arm/v7/opcodes/Makefile.am
@@ -13,7 +13,7 @@ noinst_LTLIBRARIES = libarmv7opcodes.la
 
 libarmv7opcodes_la_SOURCES = $(GENERATED_FILES)
 
-libarmv7opcodes_la_LIBADD =
+libarmv7opcodes_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
@@ -21,11 +21,6 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libarmv7opcodes_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -I$(top_srcdir)/src
-
-
 CLEANFILES = $(GENERATED_FILES)
 
 dist-hook:
diff --git a/plugins/arm/v7/operands/Makefile.am b/plugins/arm/v7/operands/Makefile.am
index 31f6a8a..fa7ab8b 100644
--- a/plugins/arm/v7/operands/Makefile.am
+++ b/plugins/arm/v7/operands/Makefile.am
@@ -1,26 +1,21 @@
 
 noinst_LTLIBRARIES = libarmv7operands.la
 
-libarmv7operands_la_SOURCES = 			\
-	estate.h estate.c					\
-	iflags.h iflags.c					\
-	it.h it.c							\
-	limitation.h limitation.c			\
-	maccess.h maccess.c					\
-	offset.h offset.c					\
-	register.h register.c				\
-	reglist.h reglist.c					\
-	rotation.h rotation.c				\
+libarmv7operands_la_SOURCES = 				\
+	estate.h estate.c						\
+	iflags.h iflags.c						\
+	it.h it.c								\
+	limitation.h limitation.c				\
+	maccess.h maccess.c						\
+	offset.h offset.c						\
+	register.h register.c					\
+	reglist.h reglist.c						\
+	rotation.h rotation.c					\
 	shift.h shift.c
 
-libarmv7operands_la_LIBADD =
+libarmv7operands_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmv7operands_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/arm/v7/operands/estate.c b/plugins/arm/v7/operands/estate.c
index d82ffa1..accde6d 100644
--- a/plugins/arm/v7/operands/estate.c
+++ b/plugins/arm/v7/operands/estate.c
@@ -24,7 +24,7 @@
 #include "estate.h"
 
 
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../operand-int.h"
diff --git a/plugins/arm/v7/operands/iflags.c b/plugins/arm/v7/operands/iflags.c
index 2e26810..f0a5e07 100644
--- a/plugins/arm/v7/operands/iflags.c
+++ b/plugins/arm/v7/operands/iflags.c
@@ -24,7 +24,7 @@
 #include "iflags.h"
 
 
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../operand-int.h"
diff --git a/plugins/arm/v7/operands/it.c b/plugins/arm/v7/operands/it.c
index 0286e06..46e1b4c 100644
--- a/plugins/arm/v7/operands/it.c
+++ b/plugins/arm/v7/operands/it.c
@@ -28,7 +28,7 @@
 
 
 #include <common/sort.h>
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../operand-int.h"
diff --git a/plugins/arm/v7/operands/limitation.c b/plugins/arm/v7/operands/limitation.c
index fe8d9fb..d9e11cf 100644
--- a/plugins/arm/v7/operands/limitation.c
+++ b/plugins/arm/v7/operands/limitation.c
@@ -26,7 +26,7 @@
 
 #include <arch/operand-int.h>
 #include <common/sort.h>
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../operand-int.h"
diff --git a/plugins/arm/v7/operands/maccess.c b/plugins/arm/v7/operands/maccess.c
index b67b65a..77d031f 100644
--- a/plugins/arm/v7/operands/maccess.c
+++ b/plugins/arm/v7/operands/maccess.c
@@ -30,8 +30,8 @@
 
 
 #include <common/cpp.h>
+#include <core/columns.h>
 #include <core/logs.h>
-#include <gtkext/gtkblockdisplay.h>
 
 
 #include "../operand-int.h"
diff --git a/plugins/arm/v7/operands/offset.c b/plugins/arm/v7/operands/offset.c
index 79c5cf9..724523d 100644
--- a/plugins/arm/v7/operands/offset.c
+++ b/plugins/arm/v7/operands/offset.c
@@ -29,7 +29,7 @@
 #include <string.h>
 
 
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../operand-int.h"
diff --git a/plugins/arm/v7/operands/register.c b/plugins/arm/v7/operands/register.c
index 21dc129..fa5b887 100644
--- a/plugins/arm/v7/operands/register.c
+++ b/plugins/arm/v7/operands/register.c
@@ -26,7 +26,7 @@
 
 #include <arch/operands/register-int.h>
 #include <common/sort.h>
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 
diff --git a/plugins/arm/v7/operands/reglist.c b/plugins/arm/v7/operands/reglist.c
index df93f77..b525f28 100644
--- a/plugins/arm/v7/operands/reglist.c
+++ b/plugins/arm/v7/operands/reglist.c
@@ -31,7 +31,7 @@
 #include <arch/register.h>
 #include <arch/storage.h>
 #include <common/sort.h>
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../operand-int.h"
diff --git a/plugins/arm/v7/operands/rotation.c b/plugins/arm/v7/operands/rotation.c
index 8136401..418e5a4 100644
--- a/plugins/arm/v7/operands/rotation.c
+++ b/plugins/arm/v7/operands/rotation.c
@@ -29,8 +29,8 @@
 #include <string.h>
 
 
+#include <core/columns.h>
 #include <core/logs.h>
-#include <gtkext/gtkblockdisplay.h>
 
 
 #include "../operand-int.h"
diff --git a/plugins/arm/v7/operands/shift.c b/plugins/arm/v7/operands/shift.c
index 1e1a8ab..ee18cf0 100644
--- a/plugins/arm/v7/operands/shift.c
+++ b/plugins/arm/v7/operands/shift.c
@@ -30,7 +30,7 @@
 
 
 #include <common/sort.h>
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../operand-int.h"
diff --git a/plugins/arm/v7/registers/Makefile.am b/plugins/arm/v7/registers/Makefile.am
index 94edf09..5f731f9 100644
--- a/plugins/arm/v7/registers/Makefile.am
+++ b/plugins/arm/v7/registers/Makefile.am
@@ -1,21 +1,16 @@
 
 noinst_LTLIBRARIES = libarmv7registers.la
 
-libarmv7registers_la_SOURCES = 			\
-	banked.h banked.c					\
-	basic.h basic.c						\
-	coproc.h coproc.c					\
-	simd.h simd.c						\
+libarmv7registers_la_SOURCES = 				\
+	banked.h banked.c						\
+	basic.h basic.c							\
+	coproc.h coproc.c						\
+	simd.h simd.c							\
 	special.h special.c
 
-libarmv7registers_la_LIBADD =
+libarmv7registers_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libarmv7registers_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/arm/v7/registers/banked.c b/plugins/arm/v7/registers/banked.c
index d565f95..6e9fbf3 100644
--- a/plugins/arm/v7/registers/banked.c
+++ b/plugins/arm/v7/registers/banked.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../register-int.h"
diff --git a/plugins/arm/v7/registers/basic.c b/plugins/arm/v7/registers/basic.c
index 60ef821..358135b 100644
--- a/plugins/arm/v7/registers/basic.c
+++ b/plugins/arm/v7/registers/basic.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../register-int.h"
diff --git a/plugins/arm/v7/registers/coproc.c b/plugins/arm/v7/registers/coproc.c
index 3d4ee8e..5c256a7 100644
--- a/plugins/arm/v7/registers/coproc.c
+++ b/plugins/arm/v7/registers/coproc.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../register-int.h"
diff --git a/plugins/arm/v7/registers/simd.c b/plugins/arm/v7/registers/simd.c
index e38de0c..8c8c653 100644
--- a/plugins/arm/v7/registers/simd.c
+++ b/plugins/arm/v7/registers/simd.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../register-int.h"
diff --git a/plugins/arm/v7/registers/special.c b/plugins/arm/v7/registers/special.c
index d0bfb67..1fc9eb5 100644
--- a/plugins/arm/v7/registers/special.c
+++ b/plugins/arm/v7/registers/special.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 
-#include <gtkext/gtkblockdisplay.h>
+#include <core/columns.h>
 
 
 #include "../register-int.h"