Bump api and libtool versions and rename libview and libdocument libraries

See bug #626030

diff --git a/backend/comics/Makefile.am b/backend/comics/Makefile.am
index 3d56cd7f4a0264071f8c57ae0b82d749bf6dda85..5a36f1d1a1e46fcffebac41b0f8eae14493893e6 100644 (file)
--- a/backend/comics/Makefile.am
+++ b/backend/comics/Makefile.am
@@ -16,7 +16,7 @@ libcomicsdocument_la_SOURCES = \
 
 libcomicsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libcomicsdocument_la_LIBADD =                          \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(BACKEND_LIBS)                                 \
        $(LIB_LIBS)
 

diff --git a/backend/djvu/Makefile.am b/backend/djvu/Makefile.am
index fbd4bde632b058926c62a2659da068c2abbbfbc0..123260142ff58f1557611be1b3d2b2e48046425a 100644 (file)
--- a/backend/djvu/Makefile.am
+++ b/backend/djvu/Makefile.am
@@ -22,7 +22,7 @@ libdjvudocument_la_SOURCES =  \
 
 libdjvudocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libdjvudocument_la_LIBADD =                            \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(BACKEND_LIBS)                                 \
        $(DJVU_LIBS)
 

diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am
index 95b034eb6d3e9203590f08f8c4d78e2f61fa1a92..37665bce815c414e18eb1e0a309b9ab26558a760 100644 (file)
--- a/backend/dvi/Makefile.am
+++ b/backend/dvi/Makefile.am
@@ -27,7 +27,7 @@ libdvidocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libdvidocument_la_LIBADD =                             \
        mdvi-lib/libmdvi.la                             \
        -lkpathsea                                      \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(BACKEND_LIBS)                                 \
        $(SPECTRE_LIBS)
 

diff --git a/backend/pdf/Makefile.am b/backend/pdf/Makefile.am
index 85bbcef1e732d0b8b3c2fb08e8dc65aa002546cf..4cec06826134b836ced408f518246a22cfd12713 100644 (file)
--- a/backend/pdf/Makefile.am
+++ b/backend/pdf/Makefile.am
@@ -16,7 +16,7 @@ libpdfdocument_la_SOURCES =                   \
 
 libpdfdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpdfdocument_la_LIBADD =                             \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(BACKEND_LIBS)                                 \
        $(POPPLER_LIBS)                                 \
        $(CAIRO_PDF_LIBS)                               \

diff --git a/backend/pixbuf/Makefile.am b/backend/pixbuf/Makefile.am
index e31a8bb22eac874974050dc671b30ffa00020a80..cbcf62b2325d0df0e0577056ce31befcfd447879 100644 (file)
--- a/backend/pixbuf/Makefile.am
+++ b/backend/pixbuf/Makefile.am
@@ -15,7 +15,7 @@ libpixbufdocument_la_SOURCES =                \
 
 libpixbufdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpixbufdocument_la_LIBADD =                          \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(BACKEND_LIBS)
 
 backend_in_files = pixbufdocument.evince-backend.in

diff --git a/backend/ps/Makefile.am b/backend/ps/Makefile.am
index fdc83bcf4d3586a10c0765800828dabb9c3cca96..6126364f0f59d5160a354d2b42217a5eaa952a79 100644 (file)
--- a/backend/ps/Makefile.am
+++ b/backend/ps/Makefile.am
@@ -16,7 +16,7 @@ libpsdocument_la_SOURCES =    \
 
 libpsdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libpsdocument_la_LIBADD =                              \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(BACKEND_LIBS)                                 \
        $(SPECTRE_LIBS)
 

diff --git a/backend/tiff/Makefile.am b/backend/tiff/Makefile.am
index 72722674f0ccef14b4ad3ce68b848b9981855c53..efba565365a17bdf7622c2f8137a11a1d3715bf5 100644 (file)
--- a/backend/tiff/Makefile.am
+++ b/backend/tiff/Makefile.am
@@ -17,7 +17,7 @@ libtiffdocument_la_SOURCES =  \
 
 libtiffdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
 libtiffdocument_la_LIBADD =                            \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(BACKEND_LIBS)                 \
        -ltiff
 

diff --git a/configure.ac b/configure.ac
index 8730154b2612cb0faf08335f49a4997d6c4c2acb..ca2384dd8ff0d5b843c343856211c57ca8eb1af1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ m4_define([ev_extra_version],[])
 m4_define([ev_version],[ev_major_version.ev_minor_version.ev_micro_version()ev_extra_version])
 
 # The evince API version
-m4_define([ev_api_version], [2.32])
+m4_define([ev_api_version], [3.0])
 
 # Libtool versioning. The backend and view libraries have separate versions.
 # Before making a release, the libtool version should be modified.
@@ -128,7 +128,7 @@ AC_ARG_WITH([gtk],
      2.0|3.0) ;;
      *) AC_MSG_ERROR([invalid gtk version specified]) ;;
    esac],
-  [with_gtk=2.0])
+  [with_gtk=3.0])
 AC_MSG_RESULT([$with_gtk])
 
 dnl Specify required versions of dependencies

diff --git a/evince-document.pc.in b/evince-document.pc.in
index e8423623f61e96cdf4bb27bfd310e8e8c27f559d..6c8c0b71d215c01cd1e41b163cc8c9b0af35fb7b 100644 (file)
--- a/evince-document.pc.in
+++ b/evince-document.pc.in
@@ -8,5 +8,5 @@ Name: Evince Document
 Description: GNOME document viewer backend library
 Version: @VERSION@
 Requires: gio-2.0 >= @GLIB_REQUIRED@ gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
-Libs: -L${libdir} -levdocument
+Libs: -L${libdir} -levdocument3
 Cflags: -I${includedir}

diff --git a/evince-view.pc.in b/evince-view.pc.in
index f6e6be4e9eb63c8282fd25a06e74f98f9d9e7bef..e0af38e0df51261856daf09e69b709b42d065c5c 100644 (file)
--- a/evince-view.pc.in
+++ b/evince-view.pc.in
@@ -7,5 +7,5 @@ Name: Evince View
 Description: GNOME document viewer view library
 Version: @VERSION@
 Requires: evince-document-@EV_API_VERSION@ = @VERSION@ gthread-2.0
-Libs: -L${libdir} -levview
+Libs: -L${libdir} -levview3
 Cflags: -I${includedir}

diff --git a/help/reference/libdocument/Makefile.am b/help/reference/libdocument/Makefile.am
index f7dace3c8647e258da0ea8e905391c8eecad4eca..db0ba10b1bbfc5a8757f24ccb304f9e956aad99a 100644 (file)
--- a/help/reference/libdocument/Makefile.am
+++ b/help/reference/libdocument/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = 1.10
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE = libevdocument
+DOC_MODULE = libevdocument3
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 DOC_MODULE_VERSION = $(EV_API_VERSION)
@@ -107,7 +107,7 @@ GTKDOC_CFLAGS = \
        $(DISABLE_DEPRECATED)
 
 GTKDOC_LIBS = \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(LIBDOCUMENT_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.

diff --git a/help/reference/libview/Makefile.am b/help/reference/libview/Makefile.am
index d596dabf33b59f1087902ad10a3856ec8f2a613d..2c7453cb20bcf95f441971f66b74e074857a8174 100644 (file)
--- a/help/reference/libview/Makefile.am
+++ b/help/reference/libview/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = 1.10
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE = libevview
+DOC_MODULE = libevview3
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 DOC_MODULE_VERSION = $(EV_API_VERSION)
@@ -113,8 +113,8 @@ GTKDOC_CFLAGS = \
        $(DISABLE_DEPRECATED)
 
 GTKDOC_LIBS = \
-       $(top_builddir)/libdocument/libevdocument.la \
-       $(top_builddir)/libview/libevview.la \
+       $(top_builddir)/libdocument/libevdocument3.la \
+       $(top_builddir)/libview/libevview3.la \
        $(LIBDOCUMENT_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.

diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am
index 8c3ee731a453e59a0d5c2f5d5a45be47d368cc35..aceb2c825957d295e48b0656ead0731de579ca23 100644 (file)
--- a/help/reference/shell/Makefile.am
+++ b/help/reference/shell/Makefile.am
@@ -121,8 +121,8 @@ GTKDOC_LIBS = \
        $(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \
        $(top_builddir)/cut-n-paste/smclient/libsmclient.la             \
        $(top_builddir)/properties/libevproperties.la                   \
-       $(top_builddir)/libdocument/libevdocument.la                    \
-       $(top_builddir)/libview/libevview.la                            \
+       $(top_builddir)/libdocument/libevdocument3.la                   \
+       $(top_builddir)/libview/libevview3.la                           \
        $(top_builddir)/libmisc/libevmisc.la                            \
        $(SHELL_LIBS)                                                   \
        $(GTK_PRINT_LIBS)                                               \

diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index facf17ccf1fc3a2a8845af3f320e439a01db6101..e8bad83b4ae4f63b3d5fde7ca4921cadbe792eeb 100644 (file)
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libevdocument.la
+lib_LTLIBRARIES = libevdocument3.la
 
 NOINST_H_FILES =                               \
        ev-debug.h                              \
@@ -49,7 +49,7 @@ INST_H_FILES =                                        \
 headerdir = $(includedir)/evince/$(EV_API_VERSION)/libdocument
 header_DATA = $(INST_H_FILES)
 
-libevdocument_la_SOURCES=                      \
+libevdocument3_la_SOURCES=                     \
        ev-annotation.c                         \
        ev-async-renderer.c                     \
        ev-attachment.c                         \
@@ -90,7 +90,7 @@ libevdocument_la_SOURCES=                     \
        $(NOINST_H_FILES)                       \
        $(INST_H_FILES)
 
-libevdocument_la_CPPFLAGS = \
+libevdocument3_la_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"EvinceDocument\"               \
        -DEVINCE_UIDIR=\"$(pkgdatadir)\"                \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
@@ -99,20 +99,20 @@ libevdocument_la_CPPFLAGS = \
        -DEVINCE_COMPILATION                            \
        $(AM_CPPFLAGS)
 
-libevdocument_la_CFLAGS = \
+libevdocument3_la_CFLAGS = \
        $(LIBDOCUMENT_CFLAGS)                   \
        -I$(top_srcdir)/cut-n-paste/synctex     \
        $(WARN_CFLAGS)                          \
        $(DISABLE_DEPRECATED)                   \
        $(AM_CFLAGS)
 
-libevdocument_la_LDFLAGS = \
+libevdocument3_la_LDFLAGS = \
        -version-info $(EV_DOCUMENT_LT_VERSION_INFO)    \
        -no-undefined   \
        -export-symbols-regex "^ev_*"   \
        $(AM_LDFLAGS)
 
-libevdocument_la_LIBADD = \
+libevdocument3_la_LIBADD = \
        $(LIBDOCUMENT_LIBS)     \
        $(top_builddir)/cut-n-paste/synctex/libsynctex.la
 
@@ -150,7 +150,7 @@ EXTRA_DIST = \
 
 if ENABLE_INTROSPECTION
 
-EvinceDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES) $(filter %.c,$(libevdocument_la_SOURCES))
+EvinceDocument-$(EV_API_VERSION).gir: libevdocument3.la Makefile $(INST_H_FILES) $(filter %.c,$(libevdocument3_la_SOURCES))
        $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
        $(G_IR_SCANNER) -v --namespace EvinceDocument \
        --strip-prefix=Ev \

diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
index 280970187b84f8a9be9500321b6c7493f2ed7f01..3d9a95fec6e6b90db385391a48edf2ee74bb8ba6 100644 (file)
--- a/libmisc/Makefile.am
+++ b/libmisc/Makefile.am
@@ -16,7 +16,7 @@ libevmisc_la_CFLAGS = \
        $(DISABLE_DEPRECATED)
 
 libevmisc_la_LIBADD = \
-       $(top_builddir)/libdocument/libevdocument.la \
-       $(top_builddir)/libview/libevview.la
+       $(top_builddir)/libdocument/libevdocument3.la \
+       $(top_builddir)/libview/libevview3.la
 
 -include $(top_srcdir)/git.mk

diff --git a/libview/Makefile.am b/libview/Makefile.am
index 02e81f3b06806612e75e7f67d62394432d71695b..5e1169752354084b3d96fa025370eb7f80f6ec91 100644 (file)
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libevview.la
+lib_LTLIBRARIES = libevview3.la
 
 NOINST_H_FILES =                       \
        ev-annotation-window.h          \
@@ -28,7 +28,7 @@ INST_H_FILES =                                \
 headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview
 header_DATA = $(INST_H_FILES)
 
-libevview_la_SOURCES =                         \
+libevview3_la_SOURCES =                        \
        ev-annotation-window.c          \
        ev-document-model.c             \
        ev-loading-window.c             \
@@ -49,7 +49,7 @@ libevview_la_SOURCES =                        \
        $(NOINST_H_FILES)               \
        $(INST_H_FILES)
 
-libevview_la_CPPFLAGS = \
+libevview3_la_CPPFLAGS = \
        -DEVINCEDATADIR=\"$(pkgdatadir)\"       \
        -DG_LOG_DOMAIN=\"EvinceView\"           \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"  \
@@ -59,20 +59,20 @@ libevview_la_CPPFLAGS = \
        -I$(top_builddir)                       \
        $(AM_CPPFLAGS)
 
-libevview_la_CFLAGS = \
+libevview3_la_CFLAGS = \
        $(LIBVIEW_CFLAGS)       \
        $(WARN_CFLAGS)          \
        $(DISABLE_DEPRECATED)   \
        $(AM_CFLAGS)
 
-libevview_la_LDFLAGS = \
+libevview3_la_LDFLAGS = \
        -version-info $(EV_VIEW_LT_VERSION_INFO)        \
        -no-undefined   \
        -export-symbols-regex "^ev_*"   \
        $(AM_LDFLAGS)
 
-libevview_la_LIBADD = \
-       $(top_builddir)/libdocument/libevdocument.la \
+libevview3_la_LIBADD = \
+       $(top_builddir)/libdocument/libevdocument3.la \
        $(LIBVIEW_LIBS)
 
 BUILT_SOURCES =                        \
@@ -118,7 +118,7 @@ EXTRA_DIST = \
 
 if ENABLE_INTROSPECTION
 
-EvinceView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES) $(filter %.c,$(libevview_la_SOURCES))
+EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filter %.c,$(libevview3_la_SOURCES))
        $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
        $(G_IR_SCANNER) -v --namespace EvinceView \
        --add-include-path=$(top_builddir)/libdocument \

diff --git a/previewer/Makefile.am b/previewer/Makefile.am
index ab8f95d7b35771f3e4b376843b07f7c33bddc641..b6fdcb10231726959c0a75491c21fece8704e291 100644 (file)
--- a/previewer/Makefile.am
+++ b/previewer/Makefile.am
@@ -28,8 +28,8 @@ evince_previewer_LDFLAGS += -mwindows
 endif
 
 evince_previewer_LDADD = \
-       $(top_builddir)/libdocument/libevdocument.la    \
-       $(top_builddir)/libview/libevview.la            \
+       $(top_builddir)/libdocument/libevdocument3.la   \
+       $(top_builddir)/libview/libevview3.la           \
        $(top_builddir)/libmisc/libevmisc.la            \
        $(PREVIEWER_LIBS)
 

diff --git a/properties/Makefile.am b/properties/Makefile.am
index de90d72ed1caff4f70cea93d0863be2a3d004af2..ecbb5d9473be1d0484a820a3b4d11ea18405a715 100644 (file)
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -24,7 +24,7 @@ libevince_properties_page_la_SOURCES =        \
 
 libevince_properties_page_la_LIBADD =          \
        libevproperties.la                      \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(FRONTEND_LIBS)                        \
        $(NAUTILUS_LIBS)
 

diff --git a/shell/Makefile.am b/shell/Makefile.am
index d5c5010154a4a11b7a3dac7a9623168990ff74d3..f729c363cafe6fcededafe62239021e281a1ddd4 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -106,8 +106,8 @@ evince_LDADD=                                                                               \
        $(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \
        $(top_builddir)/cut-n-paste/smclient/libsmclient.la                             \
        $(top_builddir)/properties/libevproperties.la                                   \
-       $(top_builddir)/libdocument/libevdocument.la                                    \
-       $(top_builddir)/libview/libevview.la                                            \
+       $(top_builddir)/libdocument/libevdocument3.la                                   \
+       $(top_builddir)/libview/libevview3.la                                           \
        $(top_builddir)/libmisc/libevmisc.la                                            \
        $(SHELL_LIBS)
 

diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index 171c00f6ee313c012e1d345014cd9eeb7b9ef759..28a8483de3cca6f98b17cae9633dc8f863eafb08 100644 (file)
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -25,7 +25,7 @@ evince_thumbnailer_LDFLAGS += -mwindows
 endif
 
 evince_thumbnailer_LDADD = \
-       $(top_builddir)/libdocument/libevdocument.la    \
+       $(top_builddir)/libdocument/libevdocument3.la   \
        $(FRONTEND_LIBS)
 
 schema_files = \