librsvg r1189 - in trunk: . gdk-pixbuf-loader

[doml svn gnome org]

Author: doml
Date: Sat Nov 22 16:31:39 2008
New Revision: 1189
URL: http://svn.gnome.org/viewvc/librsvg?rev=1189&view=rev

Log:
2008-11-22  Dominic Lachowicz  <domlachowicz gmail com>
	
	* gdk-pixbuf-loader/Makefile.am: -I flag-ordering problem breaks 
build
	if system already has lib installed (#558040). Patch from 
	dmacks netspace org
	* Makefile.am: ditto


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/gdk-pixbuf-loader/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Nov 22 16:31:39 2008
@@ -79,10 +79,10 @@
 	librsvg-enum-types.h
 
 INCLUDES =				\
-	$(LIBGSF_CFLAGS)		\
-	$(LIBCROCO_CFLAGS)		\
 	-I$(top_srcdir) 		\
 	-I$(top_builddir) 		\
+	$(LIBGSF_CFLAGS)		\
+	$(LIBCROCO_CFLAGS)		\
 	$(LIBRSVG_CFLAGS) 		\
 	$(GTK_CFLAGS)			\
 	$(GDK_X11_CFLAGS)		\

Modified: trunk/gdk-pixbuf-loader/Makefile.am
==============================================================================
--- trunk/gdk-pixbuf-loader/Makefile.am	(original)
+++ trunk/gdk-pixbuf-loader/Makefile.am	Sat Nov 22 16:31:39 2008
@@ -6,11 +6,11 @@
 endif
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	$(LIBRSVG_CFLAGS) \
 	$(LIBGSF_CFLAGS) \
 	$(LIBCROCO_CFLAGS)\
-	-DGDK_PIXBUF_ENABLE_BACKEND \
-	-I$(top_srcdir)
+	-DGDK_PIXBUF_ENABLE_BACKEND
 
 if ENABLE_PIXBUF_LOADER
 target_pixbuf_loader = svg_loader.la