Refactor Makefiles to exclude GTK on demand.

4 files changed, 28 insertions, 14 deletions

diff --git a/src/arch/operands/Makefile.am b/src/arch/operands/Makefile.am
index 4371457..f2a8767 100644
--- a/src/arch/operands/Makefile.am
+++ b/src/arch/operands/Makefile.am
@@ -18,19 +18,9 @@ libarchoperands_la_SOURCES =			\
 	targetable-int.h					\
 	targetable.h targetable.c
 
-libarchoperands_la_LIBADD =	
-
-libarchoperands_la_LDFLAGS = 
+libarchoperands_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS)
 
 
 devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(libarchoperands_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
-SUBDIRS = 
diff --git a/src/arch/operands/immediate.c b/src/arch/operands/immediate.c
index 0df8bbb..9cb60a1 100644
--- a/src/arch/operands/immediate.c
+++ b/src/arch/operands/immediate.c
@@ -43,7 +43,7 @@
 #include "../../common/asm.h"
 #include "../../common/extstr.h"
 #include "../../common/sort.h"
-#include "../../gtkext/gtkblockdisplay.h"
+#include "../../core/columns.h"
 
 
 
@@ -82,9 +82,13 @@ static void g_imm_operand_print(const GImmOperand *, GBufferLine *);
 /* Compare un opérande avec un autre. */
 static int g_imm_operand_compare(const GImmOperand *, const GImmOperand *, bool);
 
+#ifdef HAVE_GTK_SUPPORT
+
 /* Construit un petit résumé concis de l'opérande. */
 static char *g_imm_operand_build_tooltip(const GImmOperand *, const GLoadedBinary *);
 
+#endif
+
 /* Fournit l'empreinte d'un candidat à une centralisation. */
 static guint g_imm_operand_hash(const GImmOperand *, bool);
 
@@ -148,7 +152,9 @@ static void g_imm_operand_class_init(GImmOperandClass *klass)
 
     operand->compare = (operand_compare_fc)g_imm_operand_compare;
     operand->print = (operand_print_fc)g_imm_operand_print;
+#ifdef HAVE_GTK_SUPPORT
     operand->build_tooltip = (operand_build_tooltip_fc)g_imm_operand_build_tooltip;
+#endif
 
     operand->hash = (operand_hash_fc)g_imm_operand_hash;
 
@@ -1226,6 +1232,9 @@ static int g_imm_operand_compare(const GImmOperand *a, const GImmOperand *b, boo
 }
 
 
+#ifdef HAVE_GTK_SUPPORT
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : operand = opérande à consulter.                              *
@@ -1314,6 +1323,9 @@ static char *g_imm_operand_build_tooltip(const GImmOperand *operand, const GLoad
 }
 
 
+#endif
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : operand = objet dont l'instance se veut unique.              *
diff --git a/src/arch/operands/known.c b/src/arch/operands/known.c
index 152bdac..5402879 100644
--- a/src/arch/operands/known.c
+++ b/src/arch/operands/known.c
@@ -32,8 +32,8 @@
 #include "immediate-int.h"
 #include "rename-int.h"
 #include "../../analysis/db/misc/rlestr.h"
+#include "../../core/columns.h"
 #include "../../core/logs.h"
-#include "../../gtkext/gtkblockdisplay.h"
 
 
 
diff --git a/src/arch/operands/target.c b/src/arch/operands/target.c
index 068d060..e33e1ee 100644
--- a/src/arch/operands/target.c
+++ b/src/arch/operands/target.c
@@ -41,7 +41,7 @@
 #include "../../format/format.h"
 #include "../../format/strsym.h"
 #include "../../glibext/gbinarycursor.h"
-#include "../../gtkext/gtkblockdisplay.h"
+#include "../../core/columns.h"
 
 
 
@@ -74,9 +74,13 @@ static int g_target_operand_compare(const GTargetOperand *, const GTargetOperand
 /* Traduit un opérande en version humainement lisible. */
 static void g_target_operand_print(const GTargetOperand *, GBufferLine *);
 
+#ifdef HAVE_GTK_SUPPORT
+
 /* Construit un petit résumé concis de l'opérande. */
 static char *g_target_operand_build_tooltip(const GTargetOperand *, const GLoadedBinary *);
 
+#endif
+
 /* Fournit l'empreinte d'un candidat à une centralisation. */
 static guint g_target_operand_hash(const GTargetOperand *, bool);
 
@@ -132,7 +136,9 @@ static void g_target_operand_class_init(GTargetOperandClass *klass)
 
     operand->compare = (operand_compare_fc)g_target_operand_compare;
     operand->print = (operand_print_fc)g_target_operand_print;
+#ifdef HAVE_GTK_SUPPORT
     operand->build_tooltip = (operand_build_tooltip_fc)g_target_operand_build_tooltip;
+#endif
 
     operand->hash = (operand_hash_fc)g_target_operand_hash;
 
@@ -382,6 +388,9 @@ GArchOperand *g_target_operand_new(MemoryDataSize size, const vmpa2t *addr)
 }
 
 
+#ifdef HAVE_GTK_SUPPORT
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : operand = opérande à consulter.                              *
@@ -462,6 +471,9 @@ static char *g_target_operand_build_tooltip(const GTargetOperand *operand, const
 }
 
 
+#endif
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : operand = structure dont le contenu est à consulter.         *