Refactor Makefiles to exclude GTK on demand.

2 files changed, 20 insertions, 15 deletions

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,