Refactor Makefiles to exclude GTK on demand.

6 files changed, 4 insertions, 46 deletions

diff --git a/src/gtkext/Makefile.am b/src/gtkext/Makefile.am
index 8c46615..5bfc55f 100644
--- a/src/gtkext/Makefile.am
+++ b/src/gtkext/Makefile.am
@@ -32,7 +32,7 @@ libgtkext_la_SOURCES =						\
 libgtkext_la_LIBADD = 					\
 	graph/libgtkextgraph.la
 
-libgtkext_la_LDFLAGS = 
+libgtkext_la_CFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
 
 
 devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
@@ -40,10 +40,6 @@ devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 dev_HEADERS = $(libgtkext_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
 SUBDIRS = graph
 
 
diff --git a/src/gtkext/graph/Makefile.am b/src/gtkext/graph/Makefile.am
index c7f1d4b..ba7318e 100644
--- a/src/gtkext/graph/Makefile.am
+++ b/src/gtkext/graph/Makefile.am
@@ -11,18 +11,9 @@ libgtkextgraph_la_SOURCES =				\
 	rank.h rank.c						\
 	vspace.h vspace.c
 
-libgtkextgraph_la_LIBADD =
-
-libgtkextgraph_la_LDFLAGS =
+libgtkextgraph_la_CFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
 
 
 devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
 
 dev_HEADERS = $(_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS =
diff --git a/src/gtkext/gtkblockdisplay.h b/src/gtkext/gtkblockdisplay.h
index 196fe2e..6c0879c 100644
--- a/src/gtkext/gtkblockdisplay.h
+++ b/src/gtkext/gtkblockdisplay.h
@@ -48,22 +48,6 @@ typedef struct _GtkBlockDisplay GtkBlockDisplay;
 typedef struct _GtkBlockDisplayClass GtkBlockDisplayClass;
 
 
-/* Désignation des colonnes d'une ligne */
-typedef enum _DisassLineColumn
-{
-    DLC_PHYSICAL,                           /* Position physique           */
-    DLC_VIRTUAL,                            /* Adresse virtuelle           */
-    DLC_BINARY,                             /* Contenu sous forme binaire  */
-    DLC_ASSEMBLY_LABEL,                     /* Etiquette dans les données  */
-    DLC_ASSEMBLY_HEAD,                      /* Instruction pour assembleur */
-    DLC_ASSEMBLY,                           /* Code pour assembleur        */
-    DLC_COMMENTS,                           /* Commentaires éventuels      */
-
-    DLC_COUNT,
-
-} DisassLineColumn;
-
-
 /* Détermine le type du composant d'affichage de bloc en langage d'assemblage. */
 GType gtk_block_display_get_type(void);
 
diff --git a/src/gtkext/gtkstatusstack.c b/src/gtkext/gtkstatusstack.c
index 0b35e1b..499ea88 100644
--- a/src/gtkext/gtkstatusstack.c
+++ b/src/gtkext/gtkstatusstack.c
@@ -554,7 +554,7 @@ void gtk_status_stack_update_current_location(GtkStatusStack *stack, const GLoad
 
     portions = g_exe_format_get_portions(format);
 
-    portion = g_binary_portion_find_at_addr(portions, addr, (GdkRectangle []) { { 0 } });
+    portion = g_binary_portion_find_at_addr(portions, addr);
 
     text = g_binary_portion_get_desc(portion);
 
diff --git a/src/gtkext/hexdisplay.h b/src/gtkext/hexdisplay.h
index 45a1da9..9190548 100644
--- a/src/gtkext/hexdisplay.h
+++ b/src/gtkext/hexdisplay.h
@@ -48,19 +48,6 @@ typedef struct _GtkHexDisplay GtkHexDisplay;
 typedef struct _GtkHexDisplayClass GtkHexDisplayClass;
 
 
-/* Désignation des colonnes d'une ligne */
-typedef enum _HexLineColumn
-{
-    HLC_PHYSICAL,                           /* Position physique           */
-    HLC_BINARY,                             /* Données binaires brutes     */
-    HLC_PADDING,                            /* Espacement forcé            */
-    HLC_TRANSLATION,                        /* Traduction de contenu       */
-
-    HLC_COUNT,
-
-} HexLineColumn;
-
-
 /* Détermine le type du composant d'affichage sous forme hexadécimale. */
 GType gtk_hex_display_get_type(void);
 
diff --git a/src/gtkext/rendering.h b/src/gtkext/rendering.h
index d80c096..9adfe1a 100644
--- a/src/gtkext/rendering.h
+++ b/src/gtkext/rendering.h
@@ -27,7 +27,7 @@
 
 
 #include <stdbool.h>
-#include <gtk/gtk.h>
+#include <gdk/gdk.h>