Refactor Makefiles to exclude GTK on demand.

32 files changed, 347 insertions, 353 deletions

diff --git a/plugins/pychrysalide/Makefile.am b/plugins/pychrysalide/Makefile.am
index 6391c80..7928595 100644
--- a/plugins/pychrysalide/Makefile.am
+++ b/plugins/pychrysalide/Makefile.am
@@ -8,31 +8,50 @@ libdir = $(pluginslibdir)
 
 if BUILD_PYTHON_PACKAGE
 
-RUN_PATH = -Wl,-rpath,'$$ORIGIN/chrysalide-libs'
+	RUN_PATH = -Wl,-rpath,'$$ORIGIN/chrysalide-libs'
 
 endif
 
 
-pychrysalide_la_SOURCES =				\
-	access.h access.c					\
-	core.h core.c						\
-	helpers.h helpers.c					\
-	star.h star.c						\
-	strenum.h strenum.c					\
-	struct.h struct.c					\
-	weak.h weak.c
-
-pychrysalide_la_LIBADD =				\
-	analysis/libpychrysaanalysis.la		\
-	arch/libpychrysaarch.la				\
-	common/libpychrysacommon.la			\
-	core/libpychrysacore.la				\
-	debug/libpychrysadebug.la			\
-	format/libpychrysaformat.la			\
-	glibext/libpychrysaglibext.la		\
-	gtkext/libpychrysagtkext.la			\
-	gui/libpychrysagui.la				\
-	mangling/libpychrysamangling.la		\
+if BUILD_GTK_SUPPORT
+
+	GTKEXT_LIBADD =							\
+		gtkext/libpychrysagtkext.la
+
+	GTKEXT_SUBDIR = 						\
+		gtkext
+
+	GUI_LIBADD =							\
+		gui/libpychrysagui.la
+
+	GUI_SUBDIR =							\
+		gui
+
+endif
+
+
+pychrysalide_la_SOURCES =					\
+	access.h access.c						\
+	core.h core.c							\
+	helpers.h helpers.c						\
+	star.h star.c							\
+	strenum.h strenum.c						\
+	struct.h struct.c
+
+AM_CFLAGS = $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
+
+pychrysalide_la_LIBADD =					\
+	analysis/libpychrysaanalysis.la			\
+	arch/libpychrysaarch.la					\
+	common/libpychrysacommon.la				\
+	core/libpychrysacore.la					\
+	debug/libpychrysadebug.la				\
+	format/libpychrysaformat.la				\
+	glibext/libpychrysaglibext.la			\
+	$(GTKEXT_LIBADD)						\
+	$(GUI_LIBADD)							\
+	mangling/libpychrysamangling.la			\
 	plugins/libpychrysaplugins.la
 
 # -ldl: dladdr(), dlerror()
@@ -49,9 +68,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(pychrysalide_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = analysis arch common core debug format glibext gtkext gui mangling plugins
+SUBDIRS = analysis arch common core debug format glibext $(GTKEXT_SUBDIR) $(GUI_SUBDIR) mangling plugins
diff --git a/plugins/pychrysalide/analysis/Makefile.am b/plugins/pychrysalide/analysis/Makefile.am
index 66a2524..67cf373 100644
--- a/plugins/pychrysalide/analysis/Makefile.am
+++ b/plugins/pychrysalide/analysis/Makefile.am
@@ -1,18 +1,18 @@
 
 noinst_LTLIBRARIES = libpychrysaanalysis.la
 
-libpychrysaanalysis_la_SOURCES =		\
-	binary.h binary.c					\
-	block.h block.c						\
-	cattribs.h cattribs.c				\
-	constants.h constants.c				\
-	content.h content.c					\
-	loaded.h loaded.c					\
-	loading.h loading.c					\
-	module.h module.c					\
-	project.h project.c					\
-	routine.h routine.c					\
-	type.h type.c						\
+libpychrysaanalysis_la_SOURCES =			\
+	binary.h binary.c						\
+	block.h block.c							\
+	cattribs.h cattribs.c					\
+	constants.h constants.c					\
+	content.h content.c						\
+	loaded.h loaded.c						\
+	loading.h loading.c						\
+	module.h module.c						\
+	project.h project.c						\
+	routine.h routine.c						\
+	type.h type.c							\
 	variable.h variable.c
 
 libpychrysaanalysis_la_LIBADD =				\
@@ -22,7 +22,8 @@ libpychrysaanalysis_la_LIBADD =				\
 	storage/libpychrysaanalysisstorage.la	\
 	types/libpychrysaanalysistypes.la
 
-libpychrysaanalysis_la_LDFLAGS = 
+libpychrysaanalysis_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
@@ -30,9 +31,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libpychrysaanalysis_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
 SUBDIRS = contents db disass storage types
diff --git a/plugins/pychrysalide/analysis/contents/Makefile.am b/plugins/pychrysalide/analysis/contents/Makefile.am
index 5014d47..9238a58 100644
--- a/plugins/pychrysalide/analysis/contents/Makefile.am
+++ b/plugins/pychrysalide/analysis/contents/Makefile.am
@@ -1,22 +1,17 @@
 
 noinst_LTLIBRARIES = libpychrysaanalysiscontents.la
 
-libpychrysaanalysiscontents_la_SOURCES = \
-	encapsulated.h encapsulated.c		\
-	file.h file.c						\
-	memory.h memory.c					\
-	module.h module.c					\
+libpychrysaanalysiscontents_la_SOURCES = 	\
+	encapsulated.h encapsulated.c			\
+	file.h file.c							\
+	memory.h memory.c						\
+	module.h module.c						\
 	restricted.h restricted.c
 
-libpychrysaanalysiscontents_la_LDFLAGS = 
+libpychrysaanalysiscontents_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysiscontents_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysalide/analysis/db/Makefile.am b/plugins/pychrysalide/analysis/db/Makefile.am
index 94d4c43..a0dcc0d 100644
--- a/plugins/pychrysalide/analysis/db/Makefile.am
+++ b/plugins/pychrysalide/analysis/db/Makefile.am
@@ -1,21 +1,22 @@
 
 noinst_LTLIBRARIES = libpychrysaanalysisdb.la
 
-libpychrysaanalysisdb_la_SOURCES =		\
-	admin.h admin.c						\
-	analyst.h analyst.c					\
-	certs.h certs.c						\
-	client.h client.c					\
-	collection.h collection.c			\
-	constants.h constants.c				\
-	item.h item.c						\
-	module.h module.c					\
+libpychrysaanalysisdb_la_SOURCES =			\
+	admin.h admin.c							\
+	analyst.h analyst.c						\
+	certs.h certs.c							\
+	client.h client.c						\
+	collection.h collection.c				\
+	constants.h constants.c					\
+	item.h item.c							\
+	module.h module.c						\
 	server.h server.c
 
-libpychrysaanalysisdb_la_LIBADD = 		\
+libpychrysaanalysisdb_la_LIBADD = 			\
 	items/libpychrysaanalysisdbitems.la
 
-libpychrysaanalysisdb_la_LDFLAGS = 
+libpychrysaanalysisdb_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
@@ -23,9 +24,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libpychrysaanalysisdb_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
 SUBDIRS = items
diff --git a/plugins/pychrysalide/analysis/db/items/Makefile.am b/plugins/pychrysalide/analysis/db/items/Makefile.am
index 2bac8ba..201aed7 100644
--- a/plugins/pychrysalide/analysis/db/items/Makefile.am
+++ b/plugins/pychrysalide/analysis/db/items/Makefile.am
@@ -1,22 +1,17 @@
 
 noinst_LTLIBRARIES = libpychrysaanalysisdbitems.la
 
-libpychrysaanalysisdbitems_la_SOURCES =	\
-	bookmark.h bookmark.c				\
-	comment.h comment.c					\
-	constants.h constants.c				\
-	module.h module.c					\
+libpychrysaanalysisdbitems_la_SOURCES =		\
+	bookmark.h bookmark.c					\
+	comment.h comment.c						\
+	constants.h constants.c					\
+	module.h module.c						\
 	switcher.h switcher.c
 
-libpychrysaanalysisdbitems_la_LDFLAGS = 
+libpychrysaanalysisdbitems_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysisdbitems_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysalide/analysis/disass/Makefile.am b/plugins/pychrysalide/analysis/disass/Makefile.am
index 1aa34ea..0daa930 100644
--- a/plugins/pychrysalide/analysis/disass/Makefile.am
+++ b/plugins/pychrysalide/analysis/disass/Makefile.am
@@ -1,21 +1,14 @@
 
 noinst_LTLIBRARIES = libpychrysaanalysisdisass.la
 
-libpychrysaanalysisdisass_la_SOURCES =	\
-	block.h block.c						\
+libpychrysaanalysisdisass_la_SOURCES =		\
+	block.h block.c							\
 	module.h module.c
 
-libpychrysaanalysisdisass_la_LDFLAGS = 
+libpychrysaanalysisdisass_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysisdisass_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/analysis/loaded.c b/plugins/pychrysalide/analysis/loaded.c
index c8674a5..4a5d8f9 100644
--- a/plugins/pychrysalide/analysis/loaded.c
+++ b/plugins/pychrysalide/analysis/loaded.c
@@ -66,6 +66,8 @@ static bool py_loaded_content_analyze_wrapper(GLoadedContent *, bool, bool, wgro
 /* Fournit le désignation associée à l'élément chargé. */
 static char *py_loaded_content_describe_wrapper(const GLoadedContent *, bool);
 
+#ifdef HAVE_GTK_SUPPORT
+
 /* Détermine le nombre de vues disponibles pour un contenu. */
 static unsigned int py_loaded_content_count_views_wrapper(const GLoadedContent *);
 
@@ -81,6 +83,8 @@ static GtkWidget *py_loaded_content_build_view_wrapper(GLoadedContent *, unsigne
 /* Retrouve l'indice correspondant à la vue donnée d'un contenu. */
 static unsigned int py_loaded_content_get_view_index_wrapper(GLoadedContent *, GtkWidget *);
 
+#endif
+
 
 
 /* ------------------------- CONNEXION AVEC L'API DE PYTHON ------------------------- */
@@ -98,6 +102,8 @@ static PyObject *py_loaded_content_describe(PyObject *, PyObject *);
 /* Etablit une liste d'obscurcissements présents. */
 static PyObject *py_loaded_content_detect_obfuscators(PyObject *, PyObject *);
 
+#ifdef HAVE_GTK_SUPPORT
+
 /* Détermine le nombre de vues disponibles pour un contenu. */
 static PyObject *py_loaded_content_count_views(PyObject *, PyObject *);
 
@@ -110,6 +116,8 @@ static PyObject *py_loaded_content_build_default_view(PyObject *, PyObject *);
 /* Met en place la vue initiale pour un contenu chargé. */
 static PyObject *py_loaded_content_build_view(PyObject *, PyObject *);
 
+#endif
+
 /* Fournit le contenu représenté de l'élément chargé. */
 static PyObject *py_loaded_content_get_content(PyObject *, void *);
 
@@ -234,11 +242,13 @@ static void py_loaded_content_init_gclass(GLoadedContentClass *class, gpointer u
 
     class->describe = py_loaded_content_describe_wrapper;
 
+#ifdef HAVE_GTK_SUPPORT
     class->count_views = py_loaded_content_count_views_wrapper;
     class->get_view_name = py_loaded_content_get_view_name_wrapper;
     class->build_def_view = py_loaded_content_build_default_view_wrapper;
     class->build_view = py_loaded_content_build_view_wrapper;
     class->get_view_index = py_loaded_content_get_view_index_wrapper;
+#endif
 
 }
 
@@ -538,6 +548,9 @@ static char *py_loaded_content_describe_wrapper(const GLoadedContent *content, b
 }
 
 
+#ifdef HAVE_GTK_SUPPORT
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : content = contenu chargé à consulter.                        *
@@ -874,6 +887,9 @@ static unsigned int py_loaded_content_get_view_index_wrapper(GLoadedContent *con
 }
 
 
+#endif
+
+
 
 /* ---------------------------------------------------------------------------------- */
 /*                           CONNEXION AVEC L'API DE PYTHON                           */
@@ -1107,6 +1123,9 @@ static PyObject *py_loaded_content_detect_obfuscators(PyObject *self, PyObject *
 }
 
 
+#ifdef HAVE_GTK_SUPPORT
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : self = contenu chargé à manipuler.                           *
@@ -1348,6 +1367,9 @@ static PyObject *py_loaded_content_get_view_index(PyObject *self, PyObject *args
 }
 
 
+#endif
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : self    = objet Python concerné par l'appel.                 *
@@ -1487,20 +1509,24 @@ PyTypeObject *get_python_loaded_content_type(void)
         LOADED_CONTENT_GET_CONTENT_CLASS_WRAPPER,
         LOADED_CONTENT_ANALYZE_WRAPPER,
         LOADED_CONTENT_DESCRIBE_WRAPPER,
+#ifdef HAVE_GTK_SUPPORT
         LOADED_CONTENT_COUNT_VIEWS_WRAPPER,
         LOADED_CONTENT_GET_VIEW_NAME_WRAPPER,
         LOADED_CONTENT_BUILD_DEFAULT_VIEW_WRAPPER,
         LOADED_CONTENT_BUILD_VIEW_WRAPPER,
         LOADED_CONTENT_GET_VIEW_INDEX_WRAPPER,
+#endif
         LOADED_CONTENT_ANALYZE_METHOD,
         LOADED_CONTENT_ANALYZE_AND_WAIT_METHOD,
         LOADED_CONTENT_DESCRIBE_METHOD,
         LOADED_CONTENT_DETECT_OBFUSCATORS_METHOD,
+#ifdef HAVE_GTK_SUPPORT
         LOADED_CONTENT_COUNT_VIEWS_METHOD,
         LOADED_CONTENT_GET_VIEW_NAME_METHOD,
         LOADED_CONTENT_BUILD_DEFAULT_VIEW_METHOD,
         LOADED_CONTENT_BUILD_VIEW_METHOD,
         LOADED_CONTENT_GET_VIEW_INDEX_METHOD,
+#endif
         { NULL }
     };
 
diff --git a/plugins/pychrysalide/analysis/storage/Makefile.am b/plugins/pychrysalide/analysis/storage/Makefile.am
index fdf2666..d0a4df4 100644
--- a/plugins/pychrysalide/analysis/storage/Makefile.am
+++ b/plugins/pychrysalide/analysis/storage/Makefile.am
@@ -9,19 +9,10 @@ libpychrysaanalysisstorage_la_SOURCES =		\
 	storage.h storage.c						\
 	tpmem.h tpmem.c
 
-libpychrysaanalysisstorage_la_LIBADD = 
-
-libpychrysaanalysisstorage_la_LDFLAGS = 
+libpychrysaanalysisstorage_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysisstorage_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/analysis/types/Makefile.am b/plugins/pychrysalide/analysis/types/Makefile.am
index d13fe0c..697c998 100644
--- a/plugins/pychrysalide/analysis/types/Makefile.am
+++ b/plugins/pychrysalide/analysis/types/Makefile.am
@@ -1,30 +1,23 @@
 
 noinst_LTLIBRARIES = libpychrysaanalysistypes.la
 
-libpychrysaanalysistypes_la_SOURCES =	\
-	array.h array.c						\
-	basic.h basic.c						\
-	constants.h constants.c				\
-	cse.h cse.c							\
-	encaps.h encaps.c					\
-	expr.h expr.c						\
-	literal.h literal.c					\
-	module.h module.c					\
-	override.h override.c				\
-	proto.h proto.c						\
+libpychrysaanalysistypes_la_SOURCES =		\
+	array.h array.c							\
+	basic.h basic.c							\
+	constants.h constants.c					\
+	cse.h cse.c								\
+	encaps.h encaps.c						\
+	expr.h expr.c							\
+	literal.h literal.c						\
+	module.h module.c						\
+	override.h override.c					\
+	proto.h proto.c							\
 	template.h template.c
 
-libpychrysaanalysistypes_la_LDFLAGS = 
+libpychrysaanalysistypes_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaanalysistypes_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/arch/Makefile.am b/plugins/pychrysalide/arch/Makefile.am
index b934412..c113f6e 100644
--- a/plugins/pychrysalide/arch/Makefile.am
+++ b/plugins/pychrysalide/arch/Makefile.am
@@ -1,22 +1,23 @@
 
 noinst_LTLIBRARIES = libpychrysaarch.la
 
-libpychrysaarch_la_SOURCES =			\
-	constants.h constants.c				\
-	context.h context.c					\
-	instriter.h instriter.c				\
-	instruction.h instruction.c			\
-	module.h module.c					\
-	operand.h operand.c					\
-	processor.h processor.c				\
-	register.h register.c				\
+libpychrysaarch_la_SOURCES =				\
+	constants.h constants.c					\
+	context.h context.c						\
+	instriter.h instriter.c					\
+	instruction.h instruction.c				\
+	module.h module.c						\
+	operand.h operand.c						\
+	processor.h processor.c					\
+	register.h register.c					\
 	vmpa.h vmpa.c
 
-libpychrysaarch_la_LIBADD =				\
+libpychrysaarch_la_LIBADD =					\
 	instructions/libpychrysaarchinstructions.la \
 	operands/libpychrysaarchoperands.la
 
-libpychrysaarch_la_LDFLAGS = 
+libpychrysaarch_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
@@ -24,9 +25,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libpychrysaarch_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
 SUBDIRS = instructions operands
diff --git a/plugins/pychrysalide/arch/instructions/Makefile.am b/plugins/pychrysalide/arch/instructions/Makefile.am
index 01c22c4..65efe42 100644
--- a/plugins/pychrysalide/arch/instructions/Makefile.am
+++ b/plugins/pychrysalide/arch/instructions/Makefile.am
@@ -2,24 +2,15 @@
 noinst_LTLIBRARIES = libpychrysaarchinstructions.la
 
 libpychrysaarchinstructions_la_SOURCES =	\
-	constants.h constants.c				\
-	module.h module.c					\
-	raw.h raw.c							\
+	constants.h constants.c					\
+	module.h module.c						\
+	raw.h raw.c								\
 	undefined.h undefined.c
 
-libpychrysaarchinstructions_la_LIBADD = 
-
-libpychrysaarchinstructions_la_LDFLAGS = 
+libpychrysaarchinstructions_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaarchinstructions_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/arch/operand.c b/plugins/pychrysalide/arch/operand.c
index 71e7cdc..edddbe6 100644
--- a/plugins/pychrysalide/arch/operand.c
+++ b/plugins/pychrysalide/arch/operand.c
@@ -60,9 +60,13 @@ static GArchOperand *py_arch_operand_get_inner_operand_from_path_wrapper(const G
 /* Traduit un opérande en version humainement lisible. */
 static void py_arch_operand_print_wrapper(const GArchOperand *, GBufferLine *);
 
+#ifdef HAVE_GTK_SUPPORT
+
 /* Construit un petit résumé concis de l'opérande. */
 static char *py_arch_operand_build_tooltip_wrapper(const GArchOperand *, const GLoadedBinary *);
 
+#endif
+
 
 
 /* ------------------------ DEFINITION D'OPERANDE QUELCONQUE ------------------------ */
@@ -186,7 +190,9 @@ static void py_arch_operand_init_gclass(GArchOperandClass *class, gpointer unuse
     class->get_inner = py_arch_operand_get_inner_operand_from_path_wrapper;
 
     class->print = py_arch_operand_print_wrapper;
+#ifdef HAVE_GTK_SUPPORT
     class->build_tooltip = py_arch_operand_build_tooltip_wrapper;
+#endif
 
 }
 
@@ -456,6 +462,9 @@ static void py_arch_operand_print_wrapper(const GArchOperand *operand, GBufferLi
 }
 
 
+#ifdef HAVE_GTK_SUPPORT
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : operand = opérande à consulter.                              *
@@ -522,6 +531,9 @@ static char *py_arch_operand_build_tooltip_wrapper(const GArchOperand *operand,
 }
 
 
+#endif
+
+
 
 /* ---------------------------------------------------------------------------------- */
 /*                          DEFINITION D'OPERANDE QUELCONQUE                          */
@@ -709,7 +721,9 @@ PyTypeObject *get_python_arch_operand_type(void)
         ARCH_OPERAND_FIND_INNER_OPERAND_PATH_WRAPPER,
         ARCH_OPERAND_GET_INNER_OPERAND_FROM_PATH_WRAPPER,
         ARCH_OPERAND_PRINT_WRAPPER,
+#ifdef HAVE_GTK_SUPPORT
         ARCH_OPERAND_BUILD_TOOLTIP_WRAPPER,
+#endif
         ARCH_OPERAND_FIND_INNER_OPERAND_PATH_METHOD,
         ARCH_OPERAND_GET_INNER_OPERAND_FROM_PATH_METHOD,
         { NULL }
diff --git a/plugins/pychrysalide/arch/operands/Makefile.am b/plugins/pychrysalide/arch/operands/Makefile.am
index 1dd54a5..a41cbbb 100644
--- a/plugins/pychrysalide/arch/operands/Makefile.am
+++ b/plugins/pychrysalide/arch/operands/Makefile.am
@@ -1,31 +1,22 @@
 
 noinst_LTLIBRARIES = libpychrysaarchoperands.la
 
-libpychrysaarchoperands_la_SOURCES =	\
-	constants.h constants.c				\
-	feeder.h feeder.c					\
-	immediate.h immediate.c				\
-	known.h known.c						\
-	module.h module.c					\
-	proxy.h proxy.c						\
-	register.h register.c				\
-	rename.h rename.c					\
-	target.h target.c					\
+libpychrysaarchoperands_la_SOURCES =		\
+	constants.h constants.c					\
+	feeder.h feeder.c						\
+	immediate.h immediate.c					\
+	known.h known.c							\
+	module.h module.c						\
+	proxy.h proxy.c							\
+	register.h register.c					\
+	rename.h rename.c						\
+	target.h target.c						\
 	targetable.h targetable.c
 
-libpychrysaarchoperands_la_LIBADD = 
-
-libpychrysaarchoperands_la_LDFLAGS = 
+libpychrysaarchoperands_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaarchoperands_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/common/Makefile.am b/plugins/pychrysalide/common/Makefile.am
index 3f1b0b6..7e1ba9e 100644
--- a/plugins/pychrysalide/common/Makefile.am
+++ b/plugins/pychrysalide/common/Makefile.am
@@ -1,25 +1,20 @@
 
 noinst_LTLIBRARIES = libpychrysacommon.la
 
-libpychrysacommon_la_SOURCES =			\
-	bits.h bits.c						\
-	fnv1a.h fnv1a.c						\
-	hex.h hex.c							\
-	leb128.h leb128.c					\
-	module.h module.c					\
-	packed.h packed.c					\
-	pathname.h pathname.c				\
+libpychrysacommon_la_SOURCES =				\
+	bits.h bits.c							\
+	fnv1a.h fnv1a.c							\
+	hex.h hex.c								\
+	leb128.h leb128.c						\
+	module.h module.c						\
+	packed.h packed.c						\
+	pathname.h pathname.c					\
 	pearson.h pearson.c
 
-libpychrysacommon_la_LDFLAGS = 
+libpychrysacommon_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysacommon_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysalide/core/Makefile.am b/plugins/pychrysalide/core/Makefile.am
index 3433856..880823d 100644
--- a/plugins/pychrysalide/core/Makefile.am
+++ b/plugins/pychrysalide/core/Makefile.am
@@ -1,25 +1,20 @@
 
 noinst_LTLIBRARIES = libpychrysacore.la
 
-libpychrysacore_la_SOURCES =			\
-	constants.h constants.c				\
-	demanglers.h demanglers.c			\
-	global.h global.c					\
-	logs.h logs.c						\
-	module.h module.c					\
-	params.h params.c					\
-	processors.h processors.c			\
+libpychrysacore_la_SOURCES =				\
+	constants.h constants.c					\
+	demanglers.h demanglers.c				\
+	global.h global.c						\
+	logs.h logs.c							\
+	module.h module.c						\
+	params.h params.c						\
+	processors.h processors.c				\
 	queue.h queue.c
 
-libpychrysacore_la_LDFLAGS = 
+libpychrysacore_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysacore_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysalide/debug/Makefile.am b/plugins/pychrysalide/debug/Makefile.am
index 24af93d..c653a6d 100644
--- a/plugins/pychrysalide/debug/Makefile.am
+++ b/plugins/pychrysalide/debug/Makefile.am
@@ -1,23 +1,14 @@
 
 noinst_LTLIBRARIES = libpychrysadebug.la
 
-libpychrysadebug_la_SOURCES =		\
-	debugger.h debugger.c			\
+libpychrysadebug_la_SOURCES =				\
+	debugger.h debugger.c					\
 	module.h module.c
 
-libpychrysadebug_la_LIBADD = 
-
-libpychrysadebug_la_LDFLAGS = 
+libpychrysadebug_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysadebug_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/format/Makefile.am b/plugins/pychrysalide/format/Makefile.am
index d9858e8..2d691e7 100644
--- a/plugins/pychrysalide/format/Makefile.am
+++ b/plugins/pychrysalide/format/Makefile.am
@@ -1,30 +1,21 @@
 
 noinst_LTLIBRARIES = libpychrysaformat.la
 
-libpychrysaformat_la_SOURCES =			\
-	constants.h constants.c				\
-	executable.h executable.c			\
-	flat.h flat.c						\
-	format.h format.c					\
-	known.h known.c						\
-	module.h module.c					\
-	strsym.h strsym.c					\
-	symbol.h symbol.c					\
+libpychrysaformat_la_SOURCES =				\
+	constants.h constants.c					\
+	executable.h executable.c				\
+	flat.h flat.c							\
+	format.h format.c						\
+	known.h known.c							\
+	module.h module.c						\
+	strsym.h strsym.c						\
+	symbol.h symbol.c						\
 	symiter.h symiter.c
 
-libpychrysaformat_la_LIBADD = 
-
-libpychrysaformat_la_LDFLAGS = 
+libpychrysaformat_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaformat_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/glibext/Makefile.am b/plugins/pychrysalide/glibext/Makefile.am
index 5a9a539..ac41a86 100644
--- a/plugins/pychrysalide/glibext/Makefile.am
+++ b/plugins/pychrysalide/glibext/Makefile.am
@@ -1,30 +1,31 @@
 
 noinst_LTLIBRARIES = libpychrysaglibext.la
 
-libpychrysaglibext_la_SOURCES =			\
-	constants.h constants.c				\
-	binarycursor.h binarycursor.c		\
-	binportion.h binportion.c			\
-	buffercache.h buffercache.c			\
-	bufferline.h bufferline.c			\
-	bufferview.h bufferview.c			\
-	configuration.h configuration.c		\
-	linecursor.h linecursor.c			\
-	linegen.h linegen.c					\
-	loadedpanel.h loadedpanel.c			\
-	module.h module.c					\
-	named.h named.c						\
+libpychrysaglibext_la_SOURCES =				\
+	constants.h constants.c					\
+	binarycursor.h binarycursor.c			\
+	binportion.h binportion.c				\
+	buffercache.h buffercache.c				\
+	bufferline.h bufferline.c				\
+	configuration.h configuration.c			\
+	linecursor.h linecursor.c				\
+	linegen.h linegen.c						\
+	module.h module.c						\
 	singleton.h singleton.c
 
-libpychrysaglibext_la_LDFLAGS = 
+if BUILD_GTK_SUPPORT
 
+libpychrysaglibext_la_SOURCES +=			\
+	bufferview.h bufferview.c				\
+	loadedpanel.h loadedpanel.c				\
+	named.h named.c
 
-devdir = $(includedir)/chrysalide/$(subdir)
+endif
 
-dev_HEADERS = $(libpychrysaglibext_la_SOURCES:%c=)
+libpychrysaglibext_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
+devdir = $(includedir)/chrysalide/$(subdir)
 
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
+dev_HEADERS = $(libpychrysaglibext_la_SOURCES:%c=)
diff --git a/plugins/pychrysalide/glibext/buffercache.c b/plugins/pychrysalide/glibext/buffercache.c
index 0cf3342..6ed516a 100644
--- a/plugins/pychrysalide/glibext/buffercache.c
+++ b/plugins/pychrysalide/glibext/buffercache.c
@@ -88,9 +88,13 @@ static PyObject *py_buffer_cache_get_line_flags(PyObject *, PyObject *);
 /* Retire une propriété particulière attachée à une ligne. */
 static PyObject *py_buffer_cache_remove_line_flag(PyObject *, PyObject *);
 
+#ifdef HAVE_GTK_SUPPORT
+
 /* Retrouve une ligne au sein d'un tampon avec un indice. */
 static PyObject *py_buffer_cache_find_line_by_index(PyObject *, PyObject *);
 
+#endif
+
 /* Avance autant que possible vers une ligne idéale. */
 static PyObject *py_buffer_cache_look_for_flag(PyObject *, PyObject *);
 
@@ -825,6 +829,9 @@ static PyObject *py_buffer_cache_remove_line_flag(PyObject *self, PyObject *args
 }
 
 
+#ifdef HAVE_GTK_SUPPORT
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : self = classe représentant un tampon de code.                *
@@ -883,6 +890,9 @@ static PyObject *py_buffer_cache_find_line_by_index(PyObject *self, PyObject *ar
 }
 
 
+#endif
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : self = classe représentant un tampon de code.                *
@@ -1157,7 +1167,9 @@ PyTypeObject *get_python_buffer_cache_type(void)
         BUFFER_CACHE_ADD_LINE_FLAG_METHOD,
         BUFFER_CACHE_GET_LINE_FLAGS_METHOD,
         BUFFER_CACHE_REMOVE_LINE_FLAG_METHOD,
+#ifdef HAVE_GTK_SUPPORT
         BUFFER_CACHE_FIND_LINE_BY_INDEX_METHOD,
+#endif
         BUFFER_CACHE_LOOK_FOR_FLAG_METHOD,
         { NULL }
     };
diff --git a/plugins/pychrysalide/glibext/constants.c b/plugins/pychrysalide/glibext/constants.c
index 373d1bf..dc8d657 100644
--- a/plugins/pychrysalide/glibext/constants.c
+++ b/plugins/pychrysalide/glibext/constants.c
@@ -30,7 +30,9 @@
 #include <glibext/configuration.h>
 #include <glibext/linesegment.h>
 #include <glibext/gbinportion.h>
-#include <glibext/gloadedpanel.h>
+#ifdef HAVE_GTK_SUPPORT
+#   include <glibext/gloadedpanel.h>
+#endif
 
 
 #include "../helpers.h"
@@ -471,6 +473,9 @@ int convert_to_rendering_tag_type(PyObject *arg, void *dst)
 }
 
 
+#ifdef HAVE_GTK_SUPPORT
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : type = type dont le dictionnaire est à compléter.            *
@@ -566,3 +571,6 @@ int convert_to_scroll_position_tweak(PyObject *arg, void *dst)
     return result;
 
 }
+
+
+#endif
diff --git a/plugins/pychrysalide/glibext/constants.h b/plugins/pychrysalide/glibext/constants.h
index 342b7ad..0e2b442 100644
--- a/plugins/pychrysalide/glibext/constants.h
+++ b/plugins/pychrysalide/glibext/constants.h
@@ -55,12 +55,16 @@ bool define_line_segment_constants(PyTypeObject *);
 /* Tente de convertir en constante RenderingTagType. */
 int convert_to_rendering_tag_type(PyObject *, void *);
 
+#ifdef HAVE_GTK_SUPPORT
+
 /* Définit les constantes relatives aux panneaux de chargement. */
 bool define_loaded_panel_constants(PyTypeObject *);
 
 /* Tente de convertir en constante ScrollPositionTweak. */
 int convert_to_scroll_position_tweak(PyObject *, void *);
 
+#endif
+
 
 
 #endif  /* _PLUGINS_PYCHRYSALIDE_GLIBEXT_CONSTANTS_H */
diff --git a/plugins/pychrysalide/gtkext/Makefile.am b/plugins/pychrysalide/gtkext/Makefile.am
index 3d15cb8..2e1260f 100644
--- a/plugins/pychrysalide/gtkext/Makefile.am
+++ b/plugins/pychrysalide/gtkext/Makefile.am
@@ -1,19 +1,20 @@
 
 noinst_LTLIBRARIES = libpychrysagtkext.la
 
-libpychrysagtkext_la_SOURCES =			\
-	blockdisplay.h blockdisplay.c		\
-	bufferdisplay.h bufferdisplay.c		\
-	displaypanel.h displaypanel.c		\
-	dockable.h dockable.c				\
-	easygtk.h easygtk.c					\
-	module.h module.c					\
+libpychrysagtkext_la_SOURCES =				\
+	blockdisplay.h blockdisplay.c			\
+	bufferdisplay.h bufferdisplay.c			\
+	displaypanel.h displaypanel.c			\
+	dockable.h dockable.c					\
+	easygtk.h easygtk.c						\
+	module.h module.c						\
 	named.h named.c
 
-libpychrysagtkext_la_LIBADD =			\
+libpychrysagtkext_la_LIBADD =				\
 	graph/libpychrysagtkextgraph.la
 
-libpychrysagtkext_la_LDFLAGS = 
+libpychrysagtkext_la_CFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
@@ -21,10 +22,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libpychrysagtkext_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-
 SUBDIRS = graph
diff --git a/plugins/pychrysalide/gtkext/graph/Makefile.am b/plugins/pychrysalide/gtkext/graph/Makefile.am
index abcdb88..25e3088 100644
--- a/plugins/pychrysalide/gtkext/graph/Makefile.am
+++ b/plugins/pychrysalide/gtkext/graph/Makefile.am
@@ -1,21 +1,16 @@
 
 noinst_LTLIBRARIES = libpychrysagtkextgraph.la
 
-libpychrysagtkextgraph_la_SOURCES =		\
-	constants.h constants.c				\
-	cluster.h cluster.c					\
-	edge.h edge.c						\
+libpychrysagtkextgraph_la_SOURCES =			\
+	constants.h constants.c					\
+	cluster.h cluster.c						\
+	edge.h edge.c							\
 	module.h module.c
 
-libpychrysagtkextgraph_la_LDFLAGS = 
+libpychrysagtkextgraph_la_CFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysagtkextgraph_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysalide/gui/Makefile.am b/plugins/pychrysalide/gui/Makefile.am
index 969701b..de2e888 100644
--- a/plugins/pychrysalide/gui/Makefile.am
+++ b/plugins/pychrysalide/gui/Makefile.am
@@ -1,18 +1,19 @@
 
 noinst_LTLIBRARIES = libpychrysagui.la
 
-libpychrysagui_la_SOURCES =				\
-	constants.h constants.c				\
-	item.h item.c						\
-	menubar.h menubar.c					\
-	module.h module.c					\
+libpychrysagui_la_SOURCES =					\
+	constants.h constants.c					\
+	item.h item.c							\
+	menubar.h menubar.c						\
+	module.h module.c						\
 	panel.h panel.c
 
-libpychrysagui_la_LIBADD =				\
-	core/libpychrysaguicore.la			\
+libpychrysagui_la_LIBADD =					\
+	core/libpychrysaguicore.la				\
 	panels/libpychrysaguipanels.la
 
-libpychrysagui_la_LDFLAGS = 
+libpychrysagui_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
@@ -20,9 +21,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libpychrysagui_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
 SUBDIRS = core panels
diff --git a/plugins/pychrysalide/gui/core/Makefile.am b/plugins/pychrysalide/gui/core/Makefile.am
index 7b3c796..8f49176 100644
--- a/plugins/pychrysalide/gui/core/Makefile.am
+++ b/plugins/pychrysalide/gui/core/Makefile.am
@@ -1,21 +1,16 @@
 
 noinst_LTLIBRARIES = libpychrysaguicore.la
 
-libpychrysaguicore_la_SOURCES =			\
-	global.h global.c					\
-	items.h items.c						\
-	module.h module.c					\
+libpychrysaguicore_la_SOURCES =				\
+	global.h global.c						\
+	items.h items.c							\
+	module.h module.c						\
 	panels.h panels.c
 
-libpychrysaguicore_la_LDFLAGS = 
+libpychrysaguicore_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaguicore_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysalide/gui/panels/Makefile.am b/plugins/pychrysalide/gui/panels/Makefile.am
index 351e34f..067c798 100644
--- a/plugins/pychrysalide/gui/panels/Makefile.am
+++ b/plugins/pychrysalide/gui/panels/Makefile.am
@@ -1,19 +1,14 @@
 
 noinst_LTLIBRARIES = libpychrysaguipanels.la
 
-libpychrysaguipanels_la_SOURCES =		\
-	module.h module.c					\
+libpychrysaguipanels_la_SOURCES =			\
+	module.h module.c						\
 	updating.h updating.c
 
-libpychrysaguipanels_la_LDFLAGS = 
+libpychrysaguipanels_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaguipanels_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysalide/helpers.c b/plugins/pychrysalide/helpers.c
index e0a3340..c289798 100644
--- a/plugins/pychrysalide/helpers.c
+++ b/plugins/pychrysalide/helpers.c
@@ -32,7 +32,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <gtk/gtk.h>
+#ifdef HAVE_GTK_SUPPORT
+#   include <gtk/gtk.h>
+#endif
 
 
 #include <i18n.h>
@@ -1210,6 +1212,9 @@ int convert_to_gobject(PyObject *arg, void *dst)
 }
 
 
+#ifdef HAVE_GTK_SUPPORT
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : arg = argument quelconque à tenter de convertir.             *
@@ -1320,6 +1325,9 @@ int convert_to_gtk_container(PyObject *arg, void *dst)
 }
 
 
+#endif
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : color = couleur dans sa définition native à copier.          *
diff --git a/plugins/pychrysalide/helpers.h b/plugins/pychrysalide/helpers.h
index 52a9370..6b2bddf 100644
--- a/plugins/pychrysalide/helpers.h
+++ b/plugins/pychrysalide/helpers.h
@@ -29,7 +29,9 @@
 #include <assert.h>
 #include <glib-object.h>
 #include <stdbool.h>
-#include <gdk/gdk.h>
+#ifdef HAVE_GTK_SUPPORT
+#   include <gdk/gdk.h>
+#endif
 
 
 
@@ -236,12 +238,36 @@ int convert_to_gtype(PyObject *, void *);
 /* Tente de convertir en instance GObject. */
 int convert_to_gobject(PyObject *, void *);
 
+#ifdef HAVE_GTK_SUPPORT
+
 /* Tente de convertir en instance de composant GTK. */
 int convert_to_gtk_widget(PyObject *, void *);
 
 /* Tente de convertir en instance de conteneur GTK. */
 int convert_to_gtk_container(PyObject *, void *);
 
+#endif
+
+
+#if !defined(HAVE_GTK_SUPPORT) && !defined(HOMEMADE_RGBA)
+
+#   define HOMEMADE_RGBA
+
+/**
+ * Copie depuis /usr/include/gtk-3.0/gdk/gdkrgba.h
+ */
+typedef struct _GdkRGBA
+{
+    gdouble red;
+    gdouble green;
+    gdouble blue;
+    gdouble alpha;
+
+} GdkRGBA;
+
+#endif
+
+
 /* Construit un objet Python pour une couleur RGBA. */
 PyObject *create_gdk_rgba(const GdkRGBA *);
 
diff --git a/plugins/pychrysalide/mangling/Makefile.am b/plugins/pychrysalide/mangling/Makefile.am
index c3294e0..640e420 100644
--- a/plugins/pychrysalide/mangling/Makefile.am
+++ b/plugins/pychrysalide/mangling/Makefile.am
@@ -1,23 +1,14 @@
 
 noinst_LTLIBRARIES = libpychrysamangling.la
 
-libpychrysamangling_la_SOURCES =		\
-	demangler.h demangler.c				\
+libpychrysamangling_la_SOURCES =			\
+	demangler.h demangler.c					\
 	module.h module.c
 
-libpychrysamangling_la_LIBADD = 
-
-libpychrysamangling_la_LDFLAGS = 
+libpychrysamangling_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysamangling_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/plugins/Makefile.am b/plugins/pychrysalide/plugins/Makefile.am
index 51d1e35..bb9ed5d 100644
--- a/plugins/pychrysalide/plugins/Makefile.am
+++ b/plugins/pychrysalide/plugins/Makefile.am
@@ -1,25 +1,16 @@
 
 noinst_LTLIBRARIES = libpychrysaplugins.la
 
-libpychrysaplugins_la_SOURCES =			\
-	constants.h constants.c				\
-	plugin.h plugin.c					\
-	module.h module.c					\
+libpychrysaplugins_la_SOURCES =				\
+	constants.h constants.c					\
+	plugin.h plugin.c						\
+	module.h module.c						\
 	translate.h translate.c
 
-libpychrysaplugins_la_LIBADD = 
-
-libpychrysaplugins_la_LDFLAGS = 
+libpychrysaplugins_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libpychrysaplugins_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_INTERPRETER_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS = 
diff --git a/plugins/pychrysalide/plugins/plugin.c b/plugins/pychrysalide/plugins/plugin.c
index bd9cdfe..a87d0a6 100644
--- a/plugins/pychrysalide/plugins/plugin.c
+++ b/plugins/pychrysalide/plugins/plugin.c
@@ -66,6 +66,8 @@ static bool py_plugin_module_manage_wrapper(GPluginModule *);
 /* Accompagne la fin du chargement des modules natifs. */
 static void py_plugin_module_notify_plugins_loaded_wrapper(GPluginModule *, PluginAction);
 
+#ifdef HAVE_GTK_SUPPORT
+
 /* Complète une liste de resources pour thème. */
 static void py_plugin_module_include_theme_wrapper(const GPluginModule *, PluginAction, gboolean, char ***, size_t *);
 
@@ -75,6 +77,8 @@ static void py_plugin_module_notify_panel_creation_wrapper(const GPluginModule *
 /* Rend compte d'un affichage ou d'un retrait de panneau. */
 static void py_plugin_module_notify_panel_docking_wrapper(const GPluginModule *, PluginAction, GPanelItem *, bool);
 
+#endif
+
 /* Procède à une opération liée à un contenu binaire. */
 static void py_plugin_module_handle_binary_content_wrapper(const GPluginModule *, PluginAction, GBinContent *, wgroup_id_t, GtkStatusStack *);
 
@@ -243,9 +247,11 @@ static void py_plugin_module_init_gclass(GPluginModuleClass *class, gpointer unu
 
     class->plugins_loaded = py_plugin_module_notify_plugins_loaded_wrapper;
 
+#ifdef HAVE_GTK_SUPPORT
     class->include_theme = py_plugin_module_include_theme_wrapper;
     class->notify_panel = py_plugin_module_notify_panel_creation_wrapper;
     class->notify_docking = py_plugin_module_notify_panel_docking_wrapper;
+#endif
 
     class->handle_content = py_plugin_module_handle_binary_content_wrapper;
     class->handle_loaded = py_plugin_module_handle_loaded_content_wrapper;
@@ -553,6 +559,9 @@ static void py_plugin_module_notify_plugins_loaded_wrapper(GPluginModule *plugin
 }
 
 
+#ifdef HAVE_GTK_SUPPORT
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : plugin    = greffon à manipuler.                             *
@@ -783,6 +792,9 @@ static void py_plugin_module_notify_panel_docking_wrapper(const GPluginModule *p
 }
 
 
+#endif
+
+
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : plugin  = greffon à manipuler.                               *
@@ -1865,9 +1877,11 @@ PyTypeObject *get_python_plugin_module_type(void)
     static PyMethodDef py_plugin_module_methods[] = {
         PLUGIN_MODULE_MANAGE_WRAPPER,
         PLUGIN_MODULE_NOTIFY_PLUGINS_LOADED_WRAPPER,
+#ifdef HAVE_GTK_SUPPORT
         PLUGIN_MODULE_INCLUDE_THEME_WRAPPER,
         PLUGIN_MODULE_ON_PANEL_CREATION_WRAPPER,
         PLUGIN_MODULE_ON_PANEL_DOCKING_WRAPPER,
+#endif
         PLUGIN_MODULE_HANDLE_BINARY_CONTENT_WRAPPER,
         PLUGIN_MODULE_HANDLE_LOADED_CONTENT_WRAPPER,
         PLUGIN_MODULE_HANDLE_BINARY_FORMAT_ANALYSIS_WRAPPER,
diff --git a/plugins/pychrysalide/weak.h b/plugins/pychrysalide/weak.h
index 01885b0..767873f 100644
--- a/plugins/pychrysalide/weak.h
+++ b/plugins/pychrysalide/weak.h
@@ -26,10 +26,10 @@
 #define _PLUGINS_PYCHRYSALIDE_WEAK_H
 
 
-#include <gtkext/gtkstatusstack.h>
-
+#include <glibext/notifier.h>
 
 
+#if 0
 /* Démarre le suivi d'une nouvelle activité. */
 activity_id_t gtk_status_stack_add_activity(GtkStatusStack *, const char *, unsigned long) __attribute__((weak));
 
@@ -44,7 +44,7 @@ void gtk_status_stack_update_activity_value(GtkStatusStack *, activity_id_t, uns
 
 /* Met fin au suivi d'une activité donnée. */
 void gtk_status_stack_remove_activity(GtkStatusStack *, activity_id_t) __attribute__((weak));
-
+#endif
 
 
 #endif  /* _PLUGINS_PYCHRYSALIDE_WEAK_H */