6 files changed, 22 insertions, 39 deletions
diff --git a/plugins/dwarf/Makefile.am b/plugins/dwarf/Makefile.am
index 5a8c9c9..c93e302 100644
--- a/plugins/dwarf/Makefile.am
+++ b/plugins/dwarf/Makefile.am
@@ -11,15 +11,15 @@ RUN_PATH = -Wl,-rpath,'$$ORIGIN/../chrysalide-libs'
 endif
 
 
-libdwarf_la_SOURCES =					\
-	abbrev.h abbrev.c					\
-	checks.h checks.c					\
-	core.h core.c						\
-	def.h								\
-	die.h die.c							\
-	form.h form.c						\
-	format.h format.c					\
-	info.h info.c						\
+libdwarf_la_SOURCES =						\
+	abbrev.h abbrev.c						\
+	checks.h checks.c						\
+	core.h core.c							\
+	def.h									\
+	die.h die.c								\
+	form.h form.c							\
+	format.h format.c						\
+	info.h info.c							\
 	utils.h utils.c
 
 
@@ -33,11 +33,13 @@ libdwarf_la_SOURCES =					\
 # 	info.h info.c						\
 # 	symbols.h symbols.c
 
-libdwarf_la_LIBADD =					\
-	v2/libdwarfv2.la					\
-	v3/libdwarfv3.la					\
+libdwarf_la_LIBADD =						\
+	v2/libdwarfv2.la						\
+	v3/libdwarfv3.la						\
 	v4/libdwarfv4.la
 
+libdwarf_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
 libdwarf_la_LDFLAGS =						\
 	-avoid-version							\
 	-L$(top_srcdir)/src/.libs -lchrysacore	\
@@ -49,8 +51,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libdwarf_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
 SUBDIRS = v2 v3 v4
diff --git a/plugins/dwarf/core.c b/plugins/dwarf/core.c
index bf1e812..7b62fb9 100644
--- a/plugins/dwarf/core.c
+++ b/plugins/dwarf/core.c
@@ -24,14 +24,13 @@
 #include "core.h"
 
 
-#include <config.h>
 #include <plugins/self.h>
 
 
 #include "format.h"
 
 
-#ifdef HAVE_PYTHON3_BINDINGS
+#ifdef INCLUDE_PYTHON3_BINDINGS
 #   define PG_REQ RL("PyChrysalide")
 #else
 #   define PG_REQ NO_REQ
diff --git a/plugins/dwarf/info.h b/plugins/dwarf/info.h
index a2fd961..6ce3e9a 100644
--- a/plugins/dwarf/info.h
+++ b/plugins/dwarf/info.h
@@ -29,6 +29,7 @@
 
 
 #include <glibext/delayed.h>
+#include <glibext/notifier.h>
 
 
 #include "format.h"
diff --git a/plugins/dwarf/v2/Makefile.am b/plugins/dwarf/v2/Makefile.am
index 1683ded..5664927 100644
--- a/plugins/dwarf/v2/Makefile.am
+++ b/plugins/dwarf/v2/Makefile.am
@@ -1,17 +1,12 @@
 
 noinst_LTLIBRARIES = libdwarfv2.la
 
-libdwarfv2_la_SOURCES =					\
+libdwarfv2_la_SOURCES =						\
 	checks.h checks.c
 
-libdwarfv2_la_LDFLAGS = $(LIBGTK_LIBS)
+libdwarfv2_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdwarfv2_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/dwarf/v3/Makefile.am b/plugins/dwarf/v3/Makefile.am
index b821d2a..2078058 100644
--- a/plugins/dwarf/v3/Makefile.am
+++ b/plugins/dwarf/v3/Makefile.am
@@ -1,17 +1,12 @@
 
 noinst_LTLIBRARIES = libdwarfv3.la
 
-libdwarfv3_la_SOURCES =					\
+libdwarfv3_la_SOURCES =						\
 	checks.h checks.c
 
-libdwarfv3_la_LDFLAGS = $(LIBGTK_LIBS)
+libdwarfv3_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdwarfv3_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/dwarf/v4/Makefile.am b/plugins/dwarf/v4/Makefile.am
index e06e8f5..ef13b2c 100644
--- a/plugins/dwarf/v4/Makefile.am
+++ b/plugins/dwarf/v4/Makefile.am
@@ -1,17 +1,12 @@
 
 noinst_LTLIBRARIES = libdwarfv4.la
 
-libdwarfv4_la_SOURCES =					\
+libdwarfv4_la_SOURCES =						\
 	checks.h checks.c
 
-libdwarfv4_la_LDFLAGS = $(LIBGTK_LIBS)
+libdwarfv4_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libdwarfv4_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)