diff options
| author | Dominic Lachowicz <domlachowicz@gmail.com> | 2008-11-22 16:28:45 +0000 |
|---|---|---|
| committer | Dom Lachowicz <doml@src.gnome.org> | 2008-11-22 16:28:45 +0000 |
| commit | 866b6a6f3fc8be0212a7d54a70abaf350ce02b7a (patch) | |
| tree | d3be53c10e6998e6174f198f06838f6eeae39fb3 | |
| parent | bf1036431036c1f7f3fbca0608b58d4954e475a8 (diff) | |
| download | librsvg-866b6a6f3fc8be0212a7d54a70abaf350ce02b7a.tar.gz | |
Stray Makefile variables (#558039). Patches from dmacks@netspace.org
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
svn path=/trunk/; revision=1188
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | gdk-pixbuf-loader/Makefile.am | 1 | ||||
| -rw-r--r-- | gtk-engine/Makefile.am | 4 | ||||
| -rw-r--r-- | rsvg-base.c | 4 |
5 files changed, 11 insertions, 8 deletions
@@ -1,5 +1,13 @@ 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 + +2008-11-22 Dominic Lachowicz <domlachowicz@gmail.com> + * gtk-engine/svg-rc-style.c: Remove deprecated GLib symbols (#560444). Patch by Luis Menina (liberforce@freeside.fr) diff --git a/Makefile.am b/Makefile.am index 741e6fc7..f7ec641a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,7 +70,7 @@ librsvg_2_la_SOURCES = \ 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 = \ diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am index 82fc0797..f5aa4cc9 100644 --- a/gdk-pixbuf-loader/Makefile.am +++ b/gdk-pixbuf-loader/Makefile.am @@ -23,7 +23,6 @@ svg_loader_la_LDFLAGS = -avoid-version -module $(no_undefined) svg_loader_la_LIBADD = \ $(top_builddir)/librsvg-2.la \ $(LIBRSVG_LIBS) \ - $(LIBGNOME_VFS_LIBS) \ $(LIBGSF_LIBS) $(LIBCROCO_LIBS) loader_LTLIBRARIES = $(target_pixbuf_loader) diff --git a/gtk-engine/Makefile.am b/gtk-engine/Makefile.am index ff9d3c8c..3209476d 100644 --- a/gtk-engine/Makefile.am +++ b/gtk-engine/Makefile.am @@ -4,7 +4,7 @@ if PLATFORM_WIN32 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 @@ libsvg_la_SOURCES = \ 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) diff --git a/rsvg-base.c b/rsvg-base.c index 0f3b24f3..c87bfcee 100644 --- a/rsvg-base.c +++ b/rsvg-base.c @@ -1626,10 +1626,6 @@ rsvg_handle_close (RsvgHandle * handle, GError ** error) return rsvg_handle_close_impl (handle, error); } -#ifdef HAVE_GNOME_VFS -#include <libgnomevfs/gnome-vfs.h> -#endif - /** * rsvg_init: * |