Refactor Makefiles to exclude GTK on demand.

11 files changed, 21 insertions, 26 deletions

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"