GNOME.org
 

pygobject r993 - in trunk: . gio gobject tests

Author: gianmt
Date: Tue Jan  6 16:57:08 2009
New Revision: 993
URL: http://svn.gnome.org/viewvc/pygobject?rev=993&view=rev

Log:
Bad -I ordering can break build fixes #566737

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/gio/Makefile.am
   trunk/gobject/Makefile.am
   trunk/tests/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Jan  6 16:57:08 2009
@@ -19,7 +19,7 @@
 	m4/jhflags.m4			\
 	m4/python.m4
 
-INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -I$(top_srcdir)/gobject
+INCLUDES = -I$(top_srcdir)/gobject $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
 
 # pkg-config files
 pkgconfigdir = $(libdir)/pkgconfig

Modified: trunk/gio/Makefile.am
==============================================================================
--- trunk/gio/Makefile.am	(original)
+++ trunk/gio/Makefile.am	Tue Jan  6 16:57:08 2009
@@ -3,11 +3,11 @@
 PLATFORM_VERSION = 2.0
 
 INCLUDES = 				\
+	-I$(top_srcdir)/glib		\
+	-I$(top_srcdir)/gobject		\
 	$(PYTHON_INCLUDES) 		\
 	$(PYGOBJECT_CFLAGS)		\
-	$(GIO_CFLAGS)			\
-	-I$(top_srcdir)/glib		\
-	-I$(top_srcdir)/gobject
+	$(GIO_CFLAGS)
 
 # defs files
 defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs

Modified: trunk/gobject/Makefile.am
==============================================================================
--- trunk/gobject/Makefile.am	(original)
+++ trunk/gobject/Makefile.am	Tue Jan  6 16:57:08 2009
@@ -33,11 +33,11 @@
 EXTRA_DIST = constants.py.in
 
 _gobject_la_CFLAGS = \
+	-I$(top_srcdir)/glib \
 	$(PYTHON_INCLUDES) \
 	$(FFI_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	 -DPY_SSIZE_T_CLEAN \
-	-I$(top_srcdir)/glib
+	 -DPY_SSIZE_T_CLEAN
 _gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_gobject|PyInit__gobject"
 _gobject_la_LIBADD = \
 	$(GLIB_LIBS) \

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Tue Jan  6 16:57:08 2009
@@ -1,7 +1,7 @@
 INCLUDES = \
+	-I$(top_srcdir)/gobject \
 	$(PYTHON_INCLUDES) \
-	$(GLIB_CFLAGS) \
-	-I$(top_srcdir)/gobject
+	$(GLIB_CFLAGS)
 
 EXTRA_DIST = \
 	$(tests) \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]