evince r3382 - in trunk: . backend/comics backend/djvu backend/dvi backend/impress backend/pdf backend/pixbuf backend/ps backend/tiff libdocument

[chpe svn gnome org]

Author: chpe
Date: Sun Jan 25 19:37:16 2009
New Revision: 3382
URL: http://svn.gnome.org/viewvc/evince?rev=3382&view=rev

Log:
        Bug 569082 â use versioned directory for backends

        * configure.ac: Define ev_binary_version and backenddir.
        * evince-document.pc.in: Add backenddir variable.
        * libdocument/Makefile.am:
        * backend/*/Makefile.am: Remove backenddir definition, so it picks
        up the one from configure.

Modified:
   trunk/ChangeLog
   trunk/backend/comics/Makefile.am
   trunk/backend/djvu/Makefile.am
   trunk/backend/dvi/Makefile.am
   trunk/backend/impress/Makefile.am
   trunk/backend/pdf/Makefile.am
   trunk/backend/pixbuf/Makefile.am
   trunk/backend/ps/Makefile.am
   trunk/backend/tiff/Makefile.am
   trunk/configure.ac
   trunk/evince-document.pc.in
   trunk/libdocument/Makefile.am

Modified: trunk/backend/comics/Makefile.am
==============================================================================
--- trunk/backend/comics/Makefile.am	(original)
+++ trunk/backend/comics/Makefile.am	Sun Jan 25 19:37:16 2009
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =                      		\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libdocument 		\

Modified: trunk/backend/djvu/Makefile.am
==============================================================================
--- trunk/backend/djvu/Makefile.am	(original)
+++ trunk/backend/djvu/Makefile.am	Sun Jan 25 19:37:16 2009
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES = \
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/libdocument				\

Modified: trunk/backend/dvi/Makefile.am
==============================================================================
--- trunk/backend/dvi/Makefile.am	(original)
+++ trunk/backend/dvi/Makefile.am	Sun Jan 25 19:37:16 2009
@@ -1,7 +1,5 @@
 SUBDIRS = mdvi-lib
 
-backenddir = $(libdir)/evince/backends
-
 INCLUDES = 					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libdocument		\

Modified: trunk/backend/impress/Makefile.am
==============================================================================
--- trunk/backend/impress/Makefile.am	(original)
+++ trunk/backend/impress/Makefile.am	Sun Jan 25 19:37:16 2009
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libdocument		\

Modified: trunk/backend/pdf/Makefile.am
==============================================================================
--- trunk/backend/pdf/Makefile.am	(original)
+++ trunk/backend/pdf/Makefile.am	Sun Jan 25 19:37:16 2009
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libdocument		\

Modified: trunk/backend/pixbuf/Makefile.am
==============================================================================
--- trunk/backend/pixbuf/Makefile.am	(original)
+++ trunk/backend/pixbuf/Makefile.am	Sun Jan 25 19:37:16 2009
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libdocument		\

Modified: trunk/backend/ps/Makefile.am
==============================================================================
--- trunk/backend/ps/Makefile.am	(original)
+++ trunk/backend/ps/Makefile.am	Sun Jan 25 19:37:16 2009
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES = 					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libdocument		\

Modified: trunk/backend/tiff/Makefile.am
==============================================================================
--- trunk/backend/tiff/Makefile.am	(original)
+++ trunk/backend/tiff/Makefile.am	Sun Jan 25 19:37:16 2009
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/libdocument		\

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan 25 19:37:16 2009
@@ -34,6 +34,9 @@
 m4_define([ev_view_lt_version_info],[ev_view_lt_current:ev_view_lt_revision:ev_view_lt_age])
 m4_define([ev_view_lt_current_minus_age],[m4_eval(ev_view_lt_current - ev_view_lt_age)])
 
+# Binary version for the document backends
+m4_define([ev_binary_version],[ev_document_lt_current])
+
 # *****************************************************************************
 
 AC_PREREQ([2.57])
@@ -449,6 +452,10 @@
 
 AC_CHECK_FUNC(localtime_r, AC_DEFINE(HAVE_LOCALTIME_R, 1, [Defines if localtime_r is available on your system]))
 
+# Backends directory
+
+AC_SUBST([backenddir],"\$(libdir)/evince/ev_binary_version/backends")
+
 # Versioning
 
 AC_SUBST([EV_MAJOR_VERSION],[ev_major_version])
@@ -456,6 +463,7 @@
 AC_SUBST([EV_MICRO_VERSION],[ev_micro_version])
 
 AC_SUBST([EV_API_VERSION],[ev_api_version])
+AC_SUBST([EV_BINARY_VERSION],[ev_binary_version])
 
 AC_SUBST([EV_DOCUMENT_LT_VERSION_INFO],[ev_document_lt_version_info])
 AC_SUBST([EV_DOCUMENT_LT_CURRENT_MINUS_AGE],[ev_document_lt_current_minus_age])

Modified: trunk/evince-document.pc.in
==============================================================================
--- trunk/evince-document.pc.in	(original)
+++ trunk/evince-document.pc.in	Sun Jan 25 19:37:16 2009
@@ -2,6 +2,7 @@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@/evince/@EV_API_VERSION@
+backenddir= libdir@/evince/@EV_BINARY_VERSION@/backends
 
 Name: Evince Document
 Description: GNOME document viewer backend library

Modified: trunk/libdocument/Makefile.am
==============================================================================
--- trunk/libdocument/Makefile.am	(original)
+++ trunk/libdocument/Makefile.am	Sun Jan 25 19:37:16 2009
@@ -77,7 +77,7 @@
 	-DG_LOG_DOMAIN=\"EvDocument\"			\
 	-DEVINCE_UIDIR=\"$(pkgdatadir)\"		\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
-	-DEV_BACKENDSDIR=\"$(libdir)/evince/backends\"	\
+	-DEV_BACKENDSDIR=\"$(backenddir)\"		\
 	-DEVINCE_COMPILATION				\
 	$(AM_CPPFLAGS)