Makefile.am: update library name to avoid conflict with librsvg

With this change, installing libsvgtiny-pixbuf alongside librsvg
should be possible. The mime types still "conflict," but the librsvg
library will come last alphabetically and should take therefore take
precendence (source: I tried it both ways). As for the thumbnailers:
it doesn't matter which gets run. They both literally do the same
thing.

The test suite also continues to exercise the correct library, even
when librsvg is installed. It seems that GDK_PIXBUF_MODULE_FILE takes
precedence over the system loader cache.

diff --git a/Makefile.am b/Makefile.am
index 052f3d7e9050fb1ae20ac2fbad8207cbbb2b09e6..f9a5018ae09ab98738bf225b8b18777330b5669e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,23 @@
 ACLOCAL_AMFLAGS = -I m4
 
 # The main library
-gdk_pixbuf_module_LTLIBRARIES = libpixbufloader-svg.la
-libpixbufloader_svg_la_SOURCES = io-svg.c
-
-libpixbufloader_svg_la_CPPFLAGS = $(CAIRO_CFLAGS) \
-                                  $(GDKPIXBUF_CFLAGS) \
-                                  $(LIBSVGTINY_CFLAGS) \
-                                  $(LIBXML2_CFLAGS) \
-                                  -DGDK_PIXBUF_ENABLE_BACKEND
-libpixbufloader_svg_la_LIBADD = $(CAIRO_LIBS) \
-                                $(GDKPIXBUF_LIBS) \
-                                $(LIBSVGTINY_LIBS) \
-                                $(LIBXML2_LIBS)
+gdk_pixbuf_module_LTLIBRARIES = libpixbufloader-libsvgtiny.la
+libpixbufloader_libsvgtiny_la_SOURCES = io-svg.c
+
+libpixbufloader_libsvgtiny_la_CPPFLAGS = $(CAIRO_CFLAGS) \
+                                         $(GDKPIXBUF_CFLAGS) \
+                                         $(LIBSVGTINY_CFLAGS) \
+                                         $(LIBXML2_CFLAGS) \
+                                         -DGDK_PIXBUF_ENABLE_BACKEND
+
+libpixbufloader_libsvgtiny_la_LIBADD = $(CAIRO_LIBS) \
+                                       $(GDKPIXBUF_LIBS) \
+                                       $(LIBSVGTINY_LIBS) \
+                                       $(LIBXML2_LIBS)
 
 # Create foo.so instead of foo.so.x.y.z, and allow it to be
 # dlopen()ed.
-libpixbufloader_svg_la_LDFLAGS = -avoid-version -module
+libpixbufloader_libsvgtiny_la_LDFLAGS = -avoid-version -module
 
 # Install our GTK thumbnailer entry
 thumbnailerdir = $(datadir)/thumbnailers/
@@ -24,9 +25,9 @@ thumbnailer_DATA = libsvgtiny.thumbnailer
 
 # The svg2png test program.
 noinst_PROGRAMS = svg2png
-svg2png_SOURCES = $(libpixbufloader_svg_la_SOURCES)
-svg2png_CPPFLAGS = $(libpixbufloader_svg_la_CPPFLAGS)
-svg2png_LDADD = $(libpixbufloader_svg_la_LIBADD)
+svg2png_SOURCES = $(libpixbufloader_libsvgtiny_la_SOURCES)
+svg2png_CPPFLAGS = $(libpixbufloader_libsvgtiny_la_CPPFLAGS)
+svg2png_LDADD = $(libpixbufloader_libsvgtiny_la_LIBADD)
 
 # Test suite
 dist_check_SCRIPTS = run-tests.sh