GNOME.org
 

[librsvg/dual-gtk] Add dual gtk+ capability

commit 9a7292daf337e4da4eacf62edb45f34c28d11df2
Author: Christian Persch <chpe gnome org>
Date:   Thu Jun 10 15:15:15 2010 +0200

    Add dual gtk+ capability
    
    Make rsvg parallel-buildable for gtk+-2.0 and gtk+-3.0.
    
    Bug #618475.

 Makefile.am                                        |   62 ++++++------
 configure.in                                       |  107 +++++++++++++-------
 doc/Makefile.am                                    |    5 +-
 doc/tmpl/rsvg-file-util.sgml                       |    3 +
 doc/tmpl/rsvg.sgml                                 |   39 +++++++
 gdk-pixbuf-loader/Makefile.am                      |    9 +-
 gtk-engine/Makefile.am                             |    4 +-
 gtk-engine/examples/bubble/Makefile.am             |   14 ++-
 gtk-engine/examples/bubble/{gtk-2.0 => }/blue.svg  |    0
 gtk-engine/examples/bubble/{gtk-2.0 => }/green.svg |    0
 gtk-engine/examples/bubble/gtk-2.0/.cvsignore      |    2 -
 gtk-engine/examples/bubble/gtk-2.0/Makefile.am     |   10 --
 gtk-engine/examples/bubble/{gtk-2.0 => }/gtkrc     |    0
 .../examples/bubble/{gtk-2.0 => }/orange.svg       |    0
 .../examples/bubble/{gtk-2.0 => }/purple.svg       |    0
 gtk-engine/examples/bubble/{gtk-2.0 => }/red.svg   |    0
 ...-uninstalled.pc.in => librsvg-uninstalled.pc.in |    4 +-
 librsvg-2.0.pc.in => librsvg.pc.in                 |    6 +-
 tests/Makefile.am                                  |    2 +-
 tools/Makefile.am                                  |    5 +-
 20 files changed, 174 insertions(+), 98 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 21ad36c..ce74c72 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,11 @@
-if HAVE_GTK
-target_rsvg_view = rsvg-view
-else
-target_rsvg_view =
-endif
-
 SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests tools doc
 
-lib_LTLIBRARIES = librsvg-2.la
-bin_PROGRAMS = rsvg-convert $(target_rsvg_view)
+lib_LTLIBRARIES = librsvg- RSVG_API_MAJOR_VERSION@.la
 
-man_MANS = rsvg.1
+bin_PROGRAMS = rsvg-convert- RSVG_API_MAJOR_VERSION@
+if HAVE_GTK
+bin_PROGRAMS += rsvg-view- RSVG_API_MAJOR_VERSION@
+endif
 
 if OS_WIN32
 else
@@ -24,7 +20,7 @@ enum_sources = \
 	librsvg-enum-types.h	\
 	librsvg-enum-types.c
 
-librsvg_2_la_SOURCES = 		\
+librsvg_ RSVG_API_MAJOR_VERSION@_la_SOURCES = 		\
 	rsvg-affine.c		\
 	librsvg-features.c 	\
 	rsvg-bpath-util.c 	\
@@ -68,10 +64,10 @@ librsvg_2_la_SOURCES = 		\
 	rsvg-gobject.c		\
 	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) -lm
+librsvg_ RSVG_API_MAJOR_VERSION@_la_LDFLAGS = -version-info @RSVG_LT_VERSION_INFO@ -export-dynamic -no-undefined -export-symbols $(srcdir)/librsvg.def
+librsvg_ RSVG_API_MAJOR_VERSION@_la_LIBADD = $(LIBGSF_LIBS) $(LIBCROCO_LIBS) $(LIBRSVG_LIBS) -lm
 
-librsvgincdir = $(includedir)/librsvg-2/librsvg
+librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
 librsvginc_HEADERS = 	\
 	$(headers)	\
 	librsvg-features.h \
@@ -88,26 +84,29 @@ INCLUDES =				\
 	-DG_LOG_DOMAIN=\"librsvg\" 	\
 	-DLIBRSVG_DATADIR="\"$(datadir)\""
 
-DEPS = $(top_builddir)/librsvg-2.la
+DEPS = $(top_builddir)/librsvg- RSVG_API_MAJOR_VERSION@.la
 LDADDS =				\
 	$(LIBGSF_LIBS)			\
 	$(GLIB_LIBS)			\
 	$(LIBCROCO_LIBS)		\
 	$(LIBRSVG_LIBS) 		\
-	$(top_builddir)/librsvg-2.la
+	$(top_builddir)/librsvg- RSVG_API_MAJOR_VERSION@.la
 
-bin_SCRIPTS=rsvg
+if GTK_API_VERSION_2
+nodist_bin_SCRIPTS = rsvg
+man_MANS = rsvg.1
+endif
 
-rsvg_convert_SOURCES=rsvg-convert.c
-rsvg_convert_LDFLAGS =
-rsvg_convert_DEPENDENCIES = $(DEPS)
-rsvg_convert_LDADD = $(LDADDS) $(libm)
+rsvg_convert_ RSVG_API_MAJOR_VERSION@_SOURCES=rsvg-convert.c
+rsvg_convert_ RSVG_API_MAJOR_VERSION@_LDFLAGS =
+rsvg_convert_ RSVG_API_MAJOR_VERSION@_DEPENDENCIES = $(DEPS)
+rsvg_convert_ RSVG_API_MAJOR_VERSION@_LDADD = $(LDADDS) $(libm)
 
-rsvg_view_SOURCES = 		\
+rsvg_view_ RSVG_API_MAJOR_VERSION@_SOURCES = 		\
 	test-display.c
-rsvg_view_LDFLAGS =
-rsvg_view_DEPENDENCIES = $(DEPS)
-rsvg_view_LDADD = $(GTK_LIBS) $(GDK_X11_LIBS) $(libm) $(LDADDS)
+rsvg_view_ RSVG_API_MAJOR_VERSION@_LDFLAGS =
+rsvg_view_ RSVG_API_MAJOR_VERSION@_DEPENDENCIES = $(DEPS)
+rsvg_view_ RSVG_API_MAJOR_VERSION@_LDADD = $(GTK_LIBS) $(GDK_X11_LIBS) $(libm) $(LDADDS)
 
 EXTRA_DIST =				\
 	MAINTAINERS			\
@@ -116,13 +115,10 @@ EXTRA_DIST =				\
 	TODO				\
 	COPYING.LIB 			\
 	librsvg.spec.in 		\
-	librsvg-2.0.pc.in 		\
-	librsvg-2.0-uninstalled.pc.in 	\
 	librsvg-zip.in 			\
 	rsvg.in				\
 	librsvg.def			\
 	$(man_MANS)			\
-	$(rsvg_view_SOURCES)		\
 	gtk-doc.make
 
 CLEANFILES = \
@@ -133,7 +129,7 @@ CLEANFILES = \
 ## `install-exec', not `install-data'.
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = librsvg-2.0.pc
+pkgconfig_DATA = librsvg-$(RSVG_API_VERSION).pc
 
 dist-hook: librsvg.spec
 	cp librsvg.spec $(distdir)
@@ -142,7 +138,7 @@ librsvg-enum-types.h: s-enum-types-h
 	@true
 
 s-enum-types-h: $(headers) Makefile
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--fhead "#ifndef __LIBRSVG_ENUM_TYPES_H__\n#define __LIBRSVG_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 			--fprod "/* enumerations from \"@filename \" */\n" \
 			--vhead "GType @enum_name _get_type (void);\n#define RSVG_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" 	\
@@ -156,7 +152,7 @@ librsvg-enum-types.c: s-enum-types-c librsvg-enum-types.h
 	@true
 
 s-enum-types-c: $(headers) Makefile
-	( cd $(srcdir) && $(GLIB_MKENUMS) \
+	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--fhead "#include \"librsvg-enum-types.h\"\n#include \"rsvg.h\"" \
 			--fprod "\n/* enumerations from \"@filename \" */" \
 			--vhead "GType\n enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G Type@Value values[] = {" 	\
@@ -168,3 +164,9 @@ s-enum-types-c: $(headers) Makefile
 	&& echo timestamp > $(@F)
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
+if GTK_API_VERSION_2
+install-exec-hook:
+	(cd $(DESTDIR)$(bindir) && $(LN_S) rsvg-convert-2 rsvg-convert)
+	(cd $(DESTDIR)$(bindir) && $(LN_S) rsvg-view-2 rsvg-view)
+endif
diff --git a/configure.in b/configure.in
index 314cebe..95cc79c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,10 +1,23 @@
-AC_INIT(rsvg.h)
+m4_define([rsvg_major_version],[2])
+m4_define([rsvg_minor_version],[26])
+m4_define([rsvg_micro_version],[4])
+m4_define([rsvg_extra_version],[])
+m4_define([rsvg_version],[rsvg_major_version.rsvg_minor_version.rsvg_micro_version()rsvg_extra_version])
+m4_define([rsvg_lt_version_info],m4_eval(rsvg_major_version + rsvg_minor_version):rsvg_micro_version:rsvg_minor_version)
+
+AC_INIT([RSVG],[rsvg_version],[https://bugzilla.gnome.org/enter_bug.cgi?product=librsvg],[rsvg])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([rsvg.h])
+
+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+AM_MAINTAINER_MODE([enable])
+
 dnl ===========================================================================
 
 FONTCONFIG_REQUIRED=1.0.1	dnl Same as in Pango, ???
-GDK_PIXBUF_REQUIRED=1.3.7
 GLIB_REQUIRED=2.12.0
 GIO_REQUIRED=2.15.4
 LIBXML_REQUIRED=2.4.7
@@ -12,34 +25,50 @@ CAIRO_REQUIRED=1.2.0
 PANGOFT2_REQUIRED=1.2.0
 PANGOCAIRO_REQUIRED=1.10.0
 
-AC_SUBST(GDK_PIXBUF_REQUIRED)
-AC_SUBST(GLIB_REQUIRED)
-AC_SUBST(GIO_REQUIRED)
-AC_SUBST(CAIRO_REQUIRED)
-AC_SUBST(LIBXML_REQUIRED)
-AC_SUBST(PANGOFT2_REQUIRED)
-
-dnl ===========================================================================
+# ===========================================================================
+
+AC_MSG_CHECKING([which gtk+ version to compile against])
+AC_ARG_WITH([gtk],
+  [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])],
+  [case "$with_gtk" in
+     2.0|3.0) ;;
+     *) AC_MSG_ERROR([invalid gtk version specified]) ;;
+   esac],
+  [with_gtk=2.0])
+AC_MSG_RESULT([$with_gtk])
+
+case "$with_gtk" in
+  2.0) RSVG_API_VERSION=2.0
+       RSVG_API_MAJOR_VERSION=2
+       GTK_API_VERSION=2.0
+       GDK_PIXBUF_REQUIRED=1.3.7
+       GTK_REQUIRED=2.16.0
+       GTK_X11_REQUIRED=2.0.0
+       ;;
+  3.0) RSVG_API_VERSION=3.0
+       RSVG_API_MAJOR_VERSION=3
+       GTK_API_VERSION=3.0
+       GDK_PIXBUF_REQUIRED=2.90.0
+       GTK_REQUIRED=2.90.0
+       GTK_X11_REQUIRED=2.90.0
+       ;;
+esac
 
-LIBRSVG_MAJOR_VERSION=2
-LIBRSVG_MINOR_VERSION=26
-LIBRSVG_MICRO_VERSION=4
-AC_SUBST(LIBRSVG_MAJOR_VERSION)
-AC_SUBST(LIBRSVG_MINOR_VERSION)
-AC_SUBST(LIBRSVG_MICRO_VERSION)
+AC_SUBST([RSVG_API_VERSION])
+AC_SUBST([RSVG_API_MAJOR_VERSION])
+AC_SUBST([GTK_API_VERSION])
 
-LIBRSVG_VERSION=$LIBRSVG_MAJOR_VERSION.$LIBRSVG_MINOR_VERSION.$LIBRSVG_MICRO_VERSION
+AC_SUBST([RSVG_LT_VERSION_INFO],[rsvg_lt_version_info])
+AC_SUBST([LIBRSVG_MAJOR_VERSION],[rsvg_major_version])
+AC_SUBST([LIBRSVG_MINOR_VERSION],[rsvg_minor_version])
+AC_SUBST([LIBRSVG_MICRO_VERSION],[rsvg_micro_version])
 
-VERSION_INFO=`expr $LIBRSVG_MAJOR_VERSION + $LIBRSVG_MINOR_VERSION`:$LIBRSVG_MICRO_VERSION:$LIBRSVG_MINOR_VERSION
-AC_SUBST(VERSION_INFO)
+AM_CONDITIONAL([GTK_API_VERSION_2],[test "$GTK_API_VERSION" = "2.0"])
+AM_CONDITIONAL([GTK_API_VERSION_3],[test "$GTK_API_VERSION" = "3.0"])
 
 dnl ===========================================================================
 
-AM_INIT_AUTOMAKE(librsvg, $LIBRSVG_VERSION)
-AM_CONFIG_HEADER(config.h)
-
-AM_MAINTAINER_MODE
-
+AC_PROG_LN_S
 AC_ISC_POSIX
 AC_PROG_CC
 AC_PROG_CPP
@@ -91,7 +120,7 @@ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
 AC_SUBST(GLIB_MKENUMS)
 
 PKG_CHECK_MODULES(LIBRSVG, \
-	gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
+	gdk-pixbuf-$GTK_API_VERSION >= $GDK_PIXBUF_REQUIRED \
 	glib-2.0 >= $GLIB_REQUIRED \
 	libxml-2.0 >= $LIBXML_REQUIRED \
 	pangoft2 >= $PANGOFT2_REQUIRED \
@@ -216,20 +245,20 @@ else
 fi
 
 have_gtk=no
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16.0, have_gtk=yes,
+PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, have_gtk=yes,
 		       have_gtk=no)
 
 GTK_VERSION=
 if test "x$have_gtk" = "xyes"; then
-   GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+   GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-$GTK_API_VERSION`
 fi
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
-AC_SUBST(GTK_VERSION)
+AC_SUBST(GTK_BINARY_VERSION)
 AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
 
 have_gdk_x11=no
-PKG_CHECK_MODULES(GDK_X11, gdk-x11-2.0 >= 2.0.0, have_gdk_x11=yes, have_gdk_x11=no)
+PKG_CHECK_MODULES(GDK_X11, gdk-x11-$GTK_API_VERSION >= $GTK_X11_REQUIRED, have_gdk_x11=yes, have_gdk_x11=no)
 
 if test "x$have_gdk_x11" = "xyes"; then
 	AC_PATH_XTRA
@@ -259,14 +288,17 @@ fi
 
 AM_CONDITIONAL(ENABLE_GTK_ENGINE, test "x$enable_gtk_theme" = "xyes")
 
-AC_PATH_PROG(QUERYLOADERS, gdk-pixbuf-query-loaders, true)
+case "$with_gtk" in
+  2.0) AC_PATH_PROG([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders],[true]) ;;
+  3.0) AC_PATH_PROG([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders-3],[true]) ;;
+esac
 
 AC_ARG_ENABLE(pixbuf-loader,
     [  --enable-pixbuf-loader  Enable a RSVG based GdkPixbuf loader [default=auto]],
     enable_pixbuf_loader="$enableval", enable_pixbuf_loader=auto)
 
 if test "x$enable_pixbuf_loader" = xauto ; then
-    if test x$QUERYLOADERS != x ; then 
+    if test "x$GDK_PIXBUF_QUERYLOADERS" != x ; then
         enable_pixbuf_loader=yes
     else
         enable_pixbuf_loader=no
@@ -325,15 +357,11 @@ AC_CONFIG_FILES([
 librsvg.spec
 librsvg-features.h
 Makefile
-librsvg-2.0.pc
-librsvg-2.0-uninstalled.pc
 librsvg-zip
-rsvg
 data/Makefile
 gtk-engine/Makefile
 gtk-engine/examples/Makefile
 gtk-engine/examples/bubble/Makefile
-gtk-engine/examples/bubble/gtk-2.0/Makefile
 gdk-pixbuf-loader/Makefile
 tests/Makefile
 tests/pdiff/Makefile
@@ -341,11 +369,18 @@ tools/Makefile
 doc/Makefile
 ])
 
+AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}.pc:librsvg.pc.in],[RSVG_API_VERSION=$RSVG_API_VERSION])
+AC_CONFIG_FILES([librsvg-${RSVG_API_VERSION}-uninstalled.pc:librsvg-uninstalled.pc.in],[RSVG_API_VERSION=$RSVG_API_VERSION])
+
+if test "$with_gtk" = "2.0"; then
+  AC_CONFIG_FILES([rsvg])
+fi
+
 AC_OUTPUT
 
 dnl =============================================================================================
 echo "
-librsvg-$LIBRSVG_VERSION
+librsvg-$VERSION for gtk+-$GTK_API_VERSION
 
 	prefix:                         ${prefix}
 	compiler:                       ${CC}
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7222a52..8674ef3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,6 +3,9 @@
 # The name of the module.
 DOC_MODULE=rsvg
 
+# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
+DOC_MODULE_VERSION = $(RSVG_API_VERSION)
+
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=rsvg-docs.sgml
 
@@ -57,7 +60,7 @@ extra_files=
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = -I$(top_srcdir) $(LIBRSVG_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/librsvg-2.la $(LIBRSVG_LIBS)
+GTKDOC_LIBS = $(top_builddir)/librsvg- RSVG_API_MAJOR_VERSION@.la $(LIBRSVG_LIBS)
 
 if GTK_DOC_INSTALLED
 include $(top_srcdir)/gtk-doc.make
diff --git a/doc/tmpl/rsvg-file-util.sgml b/doc/tmpl/rsvg-file-util.sgml
index 2d62118..8c2b4f0 100644
--- a/doc/tmpl/rsvg-file-util.sgml
+++ b/doc/tmpl/rsvg-file-util.sgml
@@ -19,6 +19,9 @@ GdkPixbuf is a library for image loading and manipulation. It is part of the cro
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION rsvg_handle_get_pixbuf ##### -->
 <para>
 
diff --git a/doc/tmpl/rsvg.sgml b/doc/tmpl/rsvg.sgml
index f8785a4..cdec9d5 100644
--- a/doc/tmpl/rsvg.sgml
+++ b/doc/tmpl/rsvg.sgml
@@ -22,6 +22,9 @@ librsvg is a component used within software applications to enable support for S
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM RsvgError ##### -->
 <para>
 
@@ -41,6 +44,7 @@ librsvg is a component used within software applications to enable support for S
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -49,6 +53,7 @@ librsvg is a component used within software applications to enable support for S
 
 </para>
 
+ void: 
 
 
 <!-- ##### FUNCTION rsvg_term ##### -->
@@ -56,6 +61,7 @@ librsvg is a component used within software applications to enable support for S
 
 </para>
 
+ void: 
 
 
 <!-- ##### FUNCTION rsvg_set_default_dpi ##### -->
@@ -80,6 +86,7 @@ librsvg is a component used within software applications to enable support for S
 
 </para>
 
+ void: 
 @Returns: 
 
 
@@ -229,3 +236,35 @@ librsvg is a component used within software applications to enable support for S
 @dimension_data: 
 
 
+<!-- ##### FUNCTION rsvg_handle_get_dimensions_sub ##### -->
+<para>
+
+</para>
+
+ handle: 
+ dimension_data: 
+ id: 
+ Returns: 
+
+
+<!-- ##### FUNCTION rsvg_handle_get_position_sub ##### -->
+<para>
+
+</para>
+
+ handle: 
+ position_data: 
+ id: 
+ Returns: 
+
+
+<!-- ##### FUNCTION rsvg_handle_has_sub ##### -->
+<para>
+
+</para>
+
+ handle: 
+ id: 
+ Returns: 
+
+
diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am
index f153fba..baf1bbe 100644
--- a/gdk-pixbuf-loader/Makefile.am
+++ b/gdk-pixbuf-loader/Makefile.am
@@ -1,5 +1,4 @@
-
-loaderdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders
+loaderdir = $(libdir)/gtk-$(GTK_API_VERSION)/$(GTK_BINARY_VERSION)/loaders
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
@@ -21,7 +20,7 @@ endif
 svg_loader_la_SOURCES = io-svg.c
 svg_loader_la_LDFLAGS = -avoid-version -module $(no_undefined)
 svg_loader_la_LIBADD = \
-	$(top_builddir)/librsvg-2.la	\
+	$(top_builddir)/librsvg- RSVG_API_MAJOR_VERSION@.la	\
 	$(LIBRSVG_LIBS) 	\
 	$(LIBGSF_LIBS) $(LIBCROCO_LIBS)
 
@@ -29,7 +28,7 @@ loader_LTLIBRARIES = $(target_pixbuf_loader)
 
 install-data-hook: 
 	if [ -z "$(DESTDIR)" ] ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
-	  $(QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+	  $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-$(GTK_API_VERSION) ; \
+	  $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(sysconfdir)/gtk-$(GTK_API_VERSION)/gdk-pixbuf.loaders ; \
 	fi
 
diff --git a/gtk-engine/Makefile.am b/gtk-engine/Makefile.am
index 3209476..ad6ffb3 100644
--- a/gtk-engine/Makefile.am
+++ b/gtk-engine/Makefile.am
@@ -6,7 +6,7 @@ endif
 
 INCLUDES = -I$(top_srcdir) $(GTK_CFLAGS) $(LIBGSF_CFLAGS) $(LIBCROCO_CFLAGS) $(LIBRSVG_CFLAGS)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
+enginedir = $(libdir)/gtk-$(GTK_API_VERSION)/$(GTK_BINARY_VERSION)/engines
 themedir = $(datadir)/themes
 
 if ENABLE_GTK_ENGINE
@@ -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) $(LIBCROCO_LIBS)
+libsvg_la_LIBADD = $(top_builddir)/librsvg- RSVG_API_MAJOR_VERSION@.la $(GTK_LIBS) $(LIBRSVG_LIBS) $(LIBCROCO_LIBS)
 
 EXTRA_DIST = $(libsvg_la_SOURCES)
diff --git a/gtk-engine/examples/bubble/Makefile.am b/gtk-engine/examples/bubble/Makefile.am
index fbb67c8..5b34f88 100644
--- a/gtk-engine/examples/bubble/Makefile.am
+++ b/gtk-engine/examples/bubble/Makefile.am
@@ -1,4 +1,12 @@
-SUBDIRS=gtk-2.0
+themedir = $(datadir)/themes/bubble/gtk-$(GTK_API_VERSION)
+theme_DATA = \
+	gtkrc		\
+	blue.svg	\
+	green.svg	\
+	orange.svg	\
+	purple.svg	\
+	red.svg
 
-themedir = $(datadir)/themes/bubble
-theme_DATA = README
+EXTRA_DIST = \
+	$(theme_DATA)	\
+	README
diff --git a/gtk-engine/examples/bubble/gtk-2.0/blue.svg b/gtk-engine/examples/bubble/blue.svg
similarity index 100%
rename from gtk-engine/examples/bubble/gtk-2.0/blue.svg
rename to gtk-engine/examples/bubble/blue.svg
diff --git a/gtk-engine/examples/bubble/gtk-2.0/green.svg b/gtk-engine/examples/bubble/green.svg
similarity index 100%
rename from gtk-engine/examples/bubble/gtk-2.0/green.svg
rename to gtk-engine/examples/bubble/green.svg
diff --git a/gtk-engine/examples/bubble/gtk-2.0/gtkrc b/gtk-engine/examples/bubble/gtkrc
similarity index 100%
rename from gtk-engine/examples/bubble/gtk-2.0/gtkrc
rename to gtk-engine/examples/bubble/gtkrc
diff --git a/gtk-engine/examples/bubble/gtk-2.0/orange.svg b/gtk-engine/examples/bubble/orange.svg
similarity index 100%
rename from gtk-engine/examples/bubble/gtk-2.0/orange.svg
rename to gtk-engine/examples/bubble/orange.svg
diff --git a/gtk-engine/examples/bubble/gtk-2.0/purple.svg b/gtk-engine/examples/bubble/purple.svg
similarity index 100%
rename from gtk-engine/examples/bubble/gtk-2.0/purple.svg
rename to gtk-engine/examples/bubble/purple.svg
diff --git a/gtk-engine/examples/bubble/gtk-2.0/red.svg b/gtk-engine/examples/bubble/red.svg
similarity index 100%
rename from gtk-engine/examples/bubble/gtk-2.0/red.svg
rename to gtk-engine/examples/bubble/red.svg
diff --git a/librsvg-2.0-uninstalled.pc.in b/librsvg-uninstalled.pc.in
similarity index 68%
rename from librsvg-2.0-uninstalled.pc.in
rename to librsvg-uninstalled.pc.in
index 214ee5a..6d55589 100644
--- a/librsvg-2.0-uninstalled.pc.in
+++ b/librsvg-uninstalled.pc.in
@@ -9,6 +9,6 @@ css_supported= CSS_SUPPORTED@
 Name: librsvg
 Description: library that renders svg files
 Version: @VERSION@
-Requires: glib-2.0 gdk-pixbuf-2.0
-Libs: ${pc_top_builddir}/${pcfiledir}/librsvg-2.la
+Requires: glib-2.0 gdk-pixbuf- GTK_API_VERSION@
+Libs: ${pc_top_builddir}/${pcfiledir}/librsvg- RSVG_API_MAJOR_VERSION@.la
 Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/librsvg-2.0.pc.in b/librsvg.pc.in
similarity index 60%
rename from librsvg-2.0.pc.in
rename to librsvg.pc.in
index 9e8cdc5..d2747b0 100644
--- a/librsvg-2.0.pc.in
+++ b/librsvg.pc.in
@@ -9,7 +9,7 @@ css_supported= CSS_SUPPORTED@
 Name: librsvg
 Description: library that renders svg files
 Version: @VERSION@
-Requires: glib-2.0 gdk-pixbuf-2.0 cairo
+Requires: glib-2.0 gdk-pixbuf- GTK_API_VERSION@ cairo
 Requires.private:
-Libs: -L${libdir} -lrsvg-2 -lm
-Cflags: -I${includedir}/librsvg-2
+Libs: -L${libdir} -lrsvg- RSVG_API_MAJOR_VERSION@ -lm
+Cflags: -I${includedir}/librsvg- RSVG_API_VERSION@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9ce473f..f6a5249 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,7 +9,7 @@ TESTS = 		\
 noinst_LTLIBRARIES = 			\
 	libtest-utils.la
 
-LDADD = $(top_builddir)/librsvg-2.la		\
+LDADD = $(top_builddir)/librsvg- RSVG_API_MAJOR_VERSION@.la		\
 	$(top_builddir)/tests/libtest-utils.la	\
 	$(top_builddir)/tests/pdiff/libpdiff.la
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a2c73f1..b5cdaf2 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,14 +19,14 @@ INCLUDES =				\
 	-DG_LOG_DOMAIN=\"librsvg\" 	\
 	-DLIBRSVG_DATADIR="\"$(datadir)\""
 
-DEPS = $(top_builddir)/librsvg-2.la	\
+DEPS = $(top_builddir)/librsvg- RSVG_API_MAJOR_VERSION@.la	\
 	librsvg_tools_main.la
 LDADDS =				\
 	$(LIBGSF_LIBS)			\
 	$(GLIB_LIBS)			\
 	$(LIBCROCO_LIBS)		\
 	$(LIBRSVG_LIBS) 		\
-	$(top_builddir)/librsvg-2.la
+	$(top_builddir)/librsvg- RSVG_API_MAJOR_VERSION@.la
 
 librsvg_tools_main_la_SOURCES = 		\
 	rsvg-tools-main.c		\
@@ -47,4 +47,3 @@ test_memory_SOURCES = test-memory.c
 test_memory_LDFLAGS =
 test_memory_DEPENDENCIES = $(DEPS)
 test_memory_LDADD = librsvg_tools_main.la $(LDADDS) $(libm)
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]