diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | gio/Makefile.am | 6 | ||||
| -rw-r--r-- | gobject/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
5 files changed, 18 insertions, 8 deletions
@@ -1,3 +1,13 @@ +2009-01-06 Gian Mario Tagliaretti <gianmt@gnome.org> + + Bug 566737 – Bad -I ordering can break build + + * Makefile.am: + * gobject/Makefile.am: + * gio/Makefile.am: + * tests/Makefile.am: + Commit a patch from [dmacks at netspace dot org] + 2009-01-04 Mads Chr. Olesen <gnome-bugzilla@shiyee.dk> * gio/gio.defs (gio.File.copy_async, gio.File.copy_finish): Define diff --git a/Makefile.am b/Makefile.am index 58220dc..fccc321 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = \ 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 diff --git a/gio/Makefile.am b/gio/Makefile.am index 3748214..a90eedb 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -3,11 +3,11 @@ AUTOMAKE_OPTIONS = 1.7 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 diff --git a/gobject/Makefile.am b/gobject/Makefile.am index e59daa4..a8f0f6f 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -33,11 +33,11 @@ CLEANFILES = constants.py 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) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 667506c..f9e9fed 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ + -I$(top_srcdir)/gobject \ $(PYTHON_INCLUDES) \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/gobject + $(GLIB_CFLAGS) EXTRA_DIST = \ $(tests) \ |