Updated Makefiles to create only one _PyGObject_API structure.

7 files changed, 3 insertions, 13 deletions

diff --git a/plugins/arm/Makefile.am b/plugins/arm/Makefile.am
index 14eff6f..8b28e95 100644
--- a/plugins/arm/Makefile.am
+++ b/plugins/arm/Makefile.am
@@ -21,8 +21,6 @@ libarm_la_LIBADD =						\
 	python/libarmpython.la				\
 	v7/libarmv7.la
 
-libarm_la_CFLAGS = $(AM_CFLAGS)
-
 libarm_la_LDFLAGS =													\
 	-L$(top_srcdir)/src/.libs -lchrysacore							\
 	-Wl,-rpath,$(abs_top_srcdir)/plugins/pychrysalide/.libs			\
@@ -34,7 +32,7 @@ devdir = $(includedir)/chrysalide-$(subdir)
 dev_HEADERS = $(libarm_la_SOURCES:%c=)
 
 
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
+AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -I$(top_srcdir)/src
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
diff --git a/plugins/arm/python/Makefile.am b/plugins/arm/python/Makefile.am
index 0ad7f10..8edc5dc 100644
--- a/plugins/arm/python/Makefile.am
+++ b/plugins/arm/python/Makefile.am
@@ -18,7 +18,7 @@ dev_HEADERS = $(libarmpython_la_SOURCES:%c=)
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
diff --git a/plugins/arm/python/v7/Makefile.am b/plugins/arm/python/v7/Makefile.am
index 6970b63..0e96605 100644
--- a/plugins/arm/python/v7/Makefile.am
+++ b/plugins/arm/python/v7/Makefile.am
@@ -15,6 +15,6 @@ dev_HEADERS = $(libarmpythonv7_la_SOURCES:%c=)
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src
+	-I$(top_srcdir)/src -DNO_IMPORT_PYGOBJECT
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/arm/v7/Makefile.am b/plugins/arm/v7/Makefile.am
index 35b8133..1bf2342 100644
--- a/plugins/arm/v7/Makefile.am
+++ b/plugins/arm/v7/Makefile.am
@@ -22,8 +22,6 @@ libarmv7_la_LIBADD =					\
 	operands/libarmv7operands.la		\
 	registers/libarmv7registers.la
 
-libarmv7_la_CFLAGS = $(AM_CFLAGS)
-
 
 devdir = $(includedir)/chrysalide-$(subdir)
 
diff --git a/plugins/arm/v7/opcodes/Makefile.am b/plugins/arm/v7/opcodes/Makefile.am
index 3f5b000..13088e6 100644
--- a/plugins/arm/v7/opcodes/Makefile.am
+++ b/plugins/arm/v7/opcodes/Makefile.am
@@ -15,8 +15,6 @@ libarmv7opcodes_la_SOURCES = $(GENERATED_FILES)
 
 libarmv7opcodes_la_LIBADD =
 
-libarmv7opcodes_la_CFLAGS = $(AM_CFLAGS)
-
 
 devdir = $(includedir)/chrysalide-$(subdir)
 
diff --git a/plugins/arm/v7/operands/Makefile.am b/plugins/arm/v7/operands/Makefile.am
index ac08569..e94665b 100644
--- a/plugins/arm/v7/operands/Makefile.am
+++ b/plugins/arm/v7/operands/Makefile.am
@@ -15,8 +15,6 @@ libarmv7operands_la_SOURCES = 			\
 
 libarmv7operands_la_LIBADD =
 
-libarmv7operands_la_CFLAGS = $(AM_CFLAGS)
-
 
 devdir = $(includedir)/chrysalide-$(subdir)
 
diff --git a/plugins/arm/v7/registers/Makefile.am b/plugins/arm/v7/registers/Makefile.am
index 49f7f82..46e4baf 100644
--- a/plugins/arm/v7/registers/Makefile.am
+++ b/plugins/arm/v7/registers/Makefile.am
@@ -10,8 +10,6 @@ libarmv7registers_la_SOURCES = 			\
 
 libarmv7registers_la_LIBADD =
 
-libarmv7registers_la_CFLAGS = $(AM_CFLAGS)
-
 
 devdir = $(includedir)/chrysalide-$(subdir)