From: Michael Orlitzky <michael@orlitzky.com>
Date: Wed, 9 Aug 2023 04:03:41 +0000 (-0400)
Subject: Makefile.am: update library name to avoid conflict with librsvg
X-Git-Tag: 0.0.2~3
X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=d00400b4029085ed155a8de62955215bec1c8ed1;p=libsvgtiny-pixbuf.git

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 052f3d7..f9a5018 100644
--- 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