librsvg r1188 - in trunk: . gdk-pixbuf-loader gtk-engine

[doml svn gnome org]

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

Log:
2008-11-22  Dominic Lachowicz  <domlachowicz gmail com>

	* Makefile.am: Stray Makefile variables (#558039). Patches from
	dmacks netspace org
	* rsvg-base.c:
	* gdk-pixbuf-loader/Makefile.am:
	* gtk-engine/Makefile.am: ditto


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/gdk-pixbuf-loader/Makefile.am
   trunk/gtk-engine/Makefile.am
   trunk/rsvg-base.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Nov 22 16:28:45 2008
@@ -70,7 +70,7 @@
 	rsvg-file-util.c
 
 librsvg_2_la_LDFLAGS = -version-info @VERSION_INFO@ -export-dynamic -no-undefined -export-symbols $(srcdir)/librsvg.def
-librsvg_2_la_LIBADD = $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) $(FREETYPE_LIBS)
+librsvg_2_la_LIBADD = $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS)
 
 librsvgincdir = $(includedir)/librsvg-2/librsvg
 librsvginc_HEADERS = 	\

Modified: trunk/gdk-pixbuf-loader/Makefile.am
==============================================================================
--- trunk/gdk-pixbuf-loader/Makefile.am	(original)
+++ trunk/gdk-pixbuf-loader/Makefile.am	Sat Nov 22 16:28:45 2008
@@ -23,7 +23,6 @@
 svg_loader_la_LIBADD = \
 	$(top_builddir)/librsvg-2.la	\
 	$(LIBRSVG_LIBS) 	\
-	$(LIBGNOME_VFS_LIBS)		\
 	$(LIBGSF_LIBS) $(LIBCROCO_LIBS)
 
 loader_LTLIBRARIES = $(target_pixbuf_loader)

Modified: trunk/gtk-engine/Makefile.am
==============================================================================
--- trunk/gtk-engine/Makefile.am	(original)
+++ trunk/gtk-engine/Makefile.am	Sat Nov 22 16:28:45 2008
@@ -4,7 +4,7 @@
 no_undefined = -no-undefined
 endif
 
-INCLUDES = $(GTK_CFLAGS) $(LIBGSF_CFLAGS) $(LIBCROCO_CFLAGS) $(LIBRSVG_CFLAGS) -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) $(GTK_CFLAGS) $(LIBGSF_CFLAGS) $(LIBCROCO_CFLAGS) $(LIBRSVG_CFLAGS)
 
 enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
 themedir = $(datadir)/themes
@@ -29,6 +29,6 @@
 	svg.h
 
 libsvg_la_LDFLAGS =  -avoid-version -module $(no_undefined)
-libsvg_la_LIBADD = $(top_builddir)/librsvg-2.la $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBGNOME_VFS_LIBS) $(LIBCROCO_LIBS)
+libsvg_la_LIBADD = $(top_builddir)/librsvg-2.la $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBCROCO_LIBS)
 
 EXTRA_DIST = $(libsvg_la_SOURCES)

Modified: trunk/rsvg-base.c
==============================================================================
--- trunk/rsvg-base.c	(original)
+++ trunk/rsvg-base.c	Sat Nov 22 16:28:45 2008
@@ -1626,10 +1626,6 @@
     return rsvg_handle_close_impl (handle, error);
 }
 
-#ifdef HAVE_GNOME_VFS
-#include <libgnomevfs/gnome-vfs.h>
-#endif
-
 /**
  * rsvg_init:
  *