Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--backend/comics/Makefile.am2
-rw-r--r--backend/djvu/Makefile.am2
-rw-r--r--backend/dvi/Makefile.am2
-rw-r--r--backend/impress/Makefile.am2
-rw-r--r--backend/pdf/Makefile.am2
-rw-r--r--backend/pixbuf/Makefile.am2
-rw-r--r--backend/ps/Makefile.am2
-rw-r--r--backend/tiff/Makefile.am2
-rw-r--r--configure.ac8
-rw-r--r--evince-document.pc.in1
-rw-r--r--libdocument/Makefile.am2
12 files changed, 20 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 06446f8..6cf8b24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2009-01-25 Christian Persch <chpe@gnome.org>
+ 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.
+
+2009-01-25 Christian Persch <chpe@gnome.org>
+
* configure.ac:
* evince-document.pc.in: Renamed from evince-backend.pc.in.
* libdocument/Makefile.am: Renamed library to libevdocument.la.
diff --git a/backend/comics/Makefile.am b/backend/comics/Makefile.am
index 36a65ae..34f1ad6 100644
--- a/backend/comics/Makefile.am
+++ b/backend/comics/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
diff --git a/backend/djvu/Makefile.am b/backend/djvu/Makefile.am
index 1b94646..9b460f4 100644
--- a/backend/djvu/Makefile.am
+++ b/backend/djvu/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am
index 72afd6a..5a9d4df 100644
--- a/backend/dvi/Makefile.am
+++ b/backend/dvi/Makefile.am
@@ -1,7 +1,5 @@
SUBDIRS = mdvi-lib
-backenddir = $(libdir)/evince/backends
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
diff --git a/backend/impress/Makefile.am b/backend/impress/Makefile.am
index b7deeb7..d6213f7 100644
--- a/backend/impress/Makefile.am
+++ b/backend/impress/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
diff --git a/backend/pdf/Makefile.am b/backend/pdf/Makefile.am
index 10272c8..34103e6 100644
--- a/backend/pdf/Makefile.am
+++ b/backend/pdf/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
diff --git a/backend/pixbuf/Makefile.am b/backend/pixbuf/Makefile.am
index decc8da..016ea8e 100644
--- a/backend/pixbuf/Makefile.am
+++ b/backend/pixbuf/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
diff --git a/backend/ps/Makefile.am b/backend/ps/Makefile.am
index 0bc6990..b6c21f6 100644
--- a/backend/ps/Makefile.am
+++ b/backend/ps/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
diff --git a/backend/tiff/Makefile.am b/backend/tiff/Makefile.am
index 79ec11e..0858b6c 100644
--- a/backend/tiff/Makefile.am
+++ b/backend/tiff/Makefile.am
@@ -1,5 +1,3 @@
-backenddir = $(libdir)/evince/backends
-
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libdocument \
diff --git a/configure.ac b/configure.ac
index a19f8fb..644eb9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,9 @@ m4_define([ev_view_lt_age],[0])
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_SUBST(EVINCE_MIME_TYPES)
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_MINOR_VERSION],[ev_minor_version])
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])
diff --git a/evince-document.pc.in b/evince-document.pc.in
index 07536df..537fb73 100644
--- a/evince-document.pc.in
+++ b/evince-document.pc.in
@@ -2,6 +2,7 @@ prefix=@prefix@
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
diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 0580c62..94b049f 100644
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -77,7 +77,7 @@ libevdocument_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"EvDocument\" \
-DEVINCE_UIDIR=\"$(pkgdatadir)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
- -DEV_BACKENDSDIR=\"$(libdir)/evince/backends\" \
+ -DEV_BACKENDSDIR=\"$(backenddir)\" \
-DEVINCE_COMPILATION \
$(AM_CPPFLAGS)