2 files changed, 12 insertions, 19 deletions
diff --git a/plugins/javadesc/Makefile.am b/plugins/javadesc/Makefile.am
index 7a79b99..8f91010 100644
--- a/plugins/javadesc/Makefile.am
+++ b/plugins/javadesc/Makefile.am
@@ -35,16 +35,18 @@ PYTHON3_SUBDIRS = python
 endif
 
 
-libjavadesc_la_SOURCES =				\
-	context.h context.c					\
-	core.h core.c						\
-	demangler.h demangler.c				\
-	field.h field.c						\
+libjavadesc_la_SOURCES =					\
+	context.h context.c						\
+	core.h core.c							\
+	demangler.h demangler.c					\
+	field.h field.c							\
 	method.h method.c
 
-libjavadesc_la_LIBADD =					\
+libjavadesc_la_LIBADD =						\
 	$(PYTHON3_LIBADD)
 
+libjavadesc_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+
 libjavadesc_la_LDFLAGS =					\
 	-avoid-version							\
 	-L$(top_srcdir)/src/.libs -lchrysacore	\
@@ -56,8 +58,4 @@ devdir = $(includedir)/chrysalide/$(subdir)
 dev_HEADERS = $(libjavadesc_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/javadesc/python/Makefile.am b/plugins/javadesc/python/Makefile.am
index aa7deeb..2b1a8eb 100644
--- a/plugins/javadesc/python/Makefile.am
+++ b/plugins/javadesc/python/Makefile.am
@@ -1,19 +1,14 @@
 
 noinst_LTLIBRARIES = libjavadescpython.la
 
-libjavadescpython_la_SOURCES =			\
-	demangler.h demangler.c				\
+libjavadescpython_la_SOURCES =				\
+	demangler.h demangler.c					\
 	module.h module.c
 
-libjavadescpython_la_LDFLAGS = 
+libjavadescpython_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 
 devdir = $(includedir)/chrysalide/$(subdir)
 
 dev_HEADERS = $(libjavadescpython_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)