3 files changed, 12 insertions, 20 deletions
diff --git a/plugins/bhash/Makefile.am b/plugins/bhash/Makefile.am
index 45c5ee0..31daeb1 100644
--- a/plugins/bhash/Makefile.am
+++ b/plugins/bhash/Makefile.am
@@ -45,9 +45,11 @@ libbhash_la_SOURCES =						\
 	tlsh.h tlsh.c							\
 	rich.h rich.c
 
-libbhash_la_LIBADD =					\
+libbhash_la_LIBADD =						\
 	$(PYTHON3_LIBADD)
 
+libbhash_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
 libbhash_la_LDFLAGS =						\
 	-avoid-version							\
 	-L$(top_srcdir)/src/.libs -lchrysacore	\
@@ -60,8 +62,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libbhash_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
 SUBDIRS = $(PYTHON3_SUBDIRS)
diff --git a/plugins/bhash/core.c b/plugins/bhash/core.c
index 91a0bf2..eb05893 100644
--- a/plugins/bhash/core.c
+++ b/plugins/bhash/core.c
@@ -24,16 +24,15 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <plugins/self.h>
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   include "python/module.h"
 #endif
 
 
-#ifdef HAVE_PYTHON3_BINDINGS_
+#ifdef INCLUDE_PYTHON3_BINDINGS_
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
@@ -63,7 +62,7 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin)
 {
     bool result;                            /* Bilan à retourner           */
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
     result = add_bhash_module_to_python_module();
 #else
     result = true;
diff --git a/plugins/bhash/python/Makefile.am b/plugins/bhash/python/Makefile.am
index 822a716..6dd127c 100644
--- a/plugins/bhash/python/Makefile.am
+++ b/plugins/bhash/python/Makefile.am
@@ -1,21 +1,16 @@
 
 noinst_LTLIBRARIES = libbhashpython.la
 
-libbhashpython_la_SOURCES =			\
-	imphash.h imphash.c				\
-	module.h module.c				\
-	tlsh.h tlsh.c					\
+libbhashpython_la_SOURCES =					\
+	imphash.h imphash.c						\
+	module.h module.c						\
+	tlsh.h tlsh.c							\
 	rich.h rich.c
 
-libbhashpython_la_LDFLAGS = 
+libbhashpython_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libbhashpython_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)