--- champlain-gtk/Makefile.in.orig	2012-03-15 20:21:20.000000000 -0500
+++ champlain-gtk/Makefile.in	2012-03-15 20:35:27.000000000 -0500
@@ -370,15 +370,15 @@
 	$(libchamplain_gtk_sources_built)
 
 libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LIBADD = \
-	$(GTK_LIBS) 	\
-	$(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
+	$(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la \
+	$(GTK_LIBS)
 
 libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LDFLAGS = \
 	-version-info $(LIBRARY_VERSION) \
 	-no-undefined \
 	-export-symbols-regex ^gtk_champlain_.*
 
-AM_CPPFLAGS = $(GTK_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION
+AM_CPPFLAGS = -I$(top_srcdir) -DCHAMPLAIN_GTK_COMPILATION $(GTK_CFLAGS) $(WARN_CFLAGS)
 lib_LTLIBRARIES = libchamplain-gtk-@CHAMPLAIN_API_VERSION@.la
 libchamplain_gtkdir = $(includedir)/libchamplain-gtk-@CHAMPLAIN_API_VERSION@/champlain-gtk
 libchamplain_gtk_HEADERS = $(libchamplain_gtk_headers_public)
@@ -394,9 +394,9 @@
 @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_FILES = $(introspection_sources)
 @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 Gtk-2.0 Champlain-@CHAMPLAIN_API_VERSION@
 @HAVE_INTROSPECTION_TRUE@GtkChamplain_@CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
-@HAVE_INTROSPECTION_TRUE@	$(DEPS_CFLAGS) $(SOUP_CFLAGS) $(GTK_CFLAGS) \
-@HAVE_INTROSPECTION_TRUE@	-I$(top_srcdir) -I$(top_builddir)\
-@HAVE_INTROSPECTION_TRUE@	-DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION
+@HAVE_INTROSPECTION_TRUE@	-I$(top_srcdir) -I$(top_builddir) \
+@HAVE_INTROSPECTION_TRUE@	-DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION \
+@HAVE_INTROSPECTION_TRUE@	$(DEPS_CFLAGS) $(SOUP_CFLAGS) $(GTK_CFLAGS)
 
 @HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)