summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerberos <[email protected]>2011-11-09 19:57:36 -0300
committerPerberos <[email protected]>2011-11-09 19:57:36 -0300
commitb48b6581d335ff95253b074d32b5d06995d54ae1 (patch)
tree3a55a2c4fe9cd3cbaab397b1b8874475f3320a64
parentda7bb154d27d3b872867223a5df60df8f5fb6e7d (diff)
downloadatril-b48b6581d335ff95253b074d32b5d06995d54ae1.tar.bz2
atril-b48b6581d335ff95253b074d32b5d06995d54ae1.tar.xz
renaming libevdocument and libevview to prevent file conflicts
Diffstat
-rw-r--r--atril-document.pc.in2
-rw-r--r--atril-view.pc.in2
-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--help/reference/libdocument/Makefile.am4
-rw-r--r--help/reference/libview/Makefile.am6
-rw-r--r--help/reference/shell/Makefile.am4
-rw-r--r--libdocument/Makefile.am16
-rw-r--r--libmisc/Makefile.am4
-rw-r--r--libview/Makefile.am18
-rw-r--r--previewer/Makefile.am4
-rw-r--r--properties/Makefile.am2
-rw-r--r--shell/Makefile.am4
-rw-r--r--thumbnailer/Makefile.am6
20 files changed, 44 insertions, 44 deletions
diff --git a/atril-document.pc.in b/atril-document.pc.in
index c2f8463b..8a528687 100644
--- a/atril-document.pc.in
+++ b/atril-document.pc.in
@@ -8,5 +8,5 @@ Name: Atril Document
Description: MATE 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} -latrildocument
Cflags: -I${includedir}
diff --git a/atril-view.pc.in b/atril-view.pc.in
index 24c172cf..043544ef 100644
--- a/atril-view.pc.in
+++ b/atril-view.pc.in
@@ -7,5 +7,5 @@ Name: Atril View
Description: MATE document viewer view library
Version: @VERSION@
Requires: atril-document-@EV_API_VERSION@ = @VERSION@ gthread-2.0
-Libs: -L${libdir} -levview
+Libs: -L${libdir} -latrilview
Cflags: -I${includedir}
diff --git a/backend/comics/Makefile.am b/backend/comics/Makefile.am
index bee9dedd..e57727be 100644
--- 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/libatrildocument.la \
$(BACKEND_LIBS) \
$(LIB_LIBS)
diff --git a/backend/djvu/Makefile.am b/backend/djvu/Makefile.am
index be255032..895a399a 100644
--- 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/libatrildocument.la \
$(BACKEND_LIBS) \
$(DJVU_LIBS)
diff --git a/backend/dvi/Makefile.am b/backend/dvi/Makefile.am
index c6787a04..710a5653 100644
--- 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/libatrildocument.la \
$(BACKEND_LIBS) \
$(SPECTRE_LIBS)
diff --git a/backend/impress/Makefile.am b/backend/impress/Makefile.am
index bd9217f8..c61c524c 100644
--- a/backend/impress/Makefile.am
+++ b/backend/impress/Makefile.am
@@ -42,7 +42,7 @@ IMPOSTER_RENDER_INCLUDE_FILES = \
libimpressdocument_la_LDFLAGS = $(BACKEND_LIBTOOL_FLAGS)
libimpressdocument_la_LIBADD = \
- $(top_builddir)/libdocument/libevdocument.la \
+ $(top_builddir)/libdocument/libatrildocument.la \
$(BACKEND_LIBS) -lz
backend_in_files = impressdocument.atril-backend.in
diff --git a/backend/pdf/Makefile.am b/backend/pdf/Makefile.am
index 05d506ae..53d037a2 100644
--- 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/libatrildocument.la \
$(BACKEND_LIBS) \
$(POPPLER_LIBS) \
$(CAIRO_PDF_LIBS) \
diff --git a/backend/pixbuf/Makefile.am b/backend/pixbuf/Makefile.am
index bd5060f5..bed7ea26 100644
--- 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/libatrildocument.la \
$(BACKEND_LIBS)
backend_in_files = pixbufdocument.atril-backend.in
diff --git a/backend/ps/Makefile.am b/backend/ps/Makefile.am
index 0e49a111..beab7bb9 100644
--- 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/libatrildocument.la \
$(BACKEND_LIBS) \
$(SPECTRE_LIBS)
diff --git a/backend/tiff/Makefile.am b/backend/tiff/Makefile.am
index 0fc2f83e..38b846e4 100644
--- 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/libatrildocument.la \
$(BACKEND_LIBS) \
-ltiff
diff --git a/help/reference/libdocument/Makefile.am b/help/reference/libdocument/Makefile.am
index 8d376421..dec03e8e 100644
--- 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 = libatrildocument
# 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/libatrildocument.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 34a18839..edbc870e 100644
--- 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 = libatrilview
# 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/libatrildocument.la \
+ $(top_builddir)/libview/libatrilview.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 945719ca..a78201d7 100644
--- 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/libatrildocument.la \
+ $(top_builddir)/libview/libatrilview.la \
$(top_builddir)/libmisc/libevmisc.la \
$(SHELL_LIBS) \
$(GTK_PRINT_LIBS) \
diff --git a/libdocument/Makefile.am b/libdocument/Makefile.am
index 799112a7..cf8c555e 100644
--- a/libdocument/Makefile.am
+++ b/libdocument/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libevdocument.la
+lib_LTLIBRARIES = libatrildocument.la
NOINST_H_FILES = \
ev-debug.h \
@@ -49,7 +49,7 @@ INST_H_FILES = \
headerdir = $(includedir)/atril/$(EV_API_VERSION)/libdocument
header_DATA = $(INST_H_FILES)
-libevdocument_la_SOURCES= \
+libatrildocument_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 = \
+libatrildocument_la_CPPFLAGS = \
-DG_LOG_DOMAIN=\"AtrilDocument\" \
-DATRIL_UIDIR=\"$(pkgdatadir)\" \
-DMATELOCALEDIR=\"$(datadir)/locale\" \
@@ -99,20 +99,20 @@ libevdocument_la_CPPFLAGS = \
-DATRIL_COMPILATION \
$(AM_CPPFLAGS)
-libevdocument_la_CFLAGS = \
+libatrildocument_la_CFLAGS = \
$(LIBDOCUMENT_CFLAGS) \
-I$(top_srcdir)/cut-n-paste/synctex \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(AM_CFLAGS)
-libevdocument_la_LDFLAGS = \
+libatrildocument_la_LDFLAGS = \
-version-info $(EV_DOCUMENT_LT_VERSION_INFO) \
-no-undefined \
-export-symbols-regex "^ev_*" \
$(AM_LDFLAGS)
-libevdocument_la_LIBADD = \
+libatrildocument_la_LIBADD = \
$(LIBDOCUMENT_LIBS) \
$(top_builddir)/cut-n-paste/synctex/libsynctex.la
@@ -150,7 +150,7 @@ EXTRA_DIST = \
if ENABLE_INTROSPECTION
-AtrilDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES) $(filter %.c,$(libevdocument_la_SOURCES))
+AtrilDocument-$(EV_API_VERSION).gir: libatrildocument.la Makefile $(INST_H_FILES) $(filter %.c,$(libatrildocument_la_SOURCES))
$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
$(G_IR_SCANNER) -v --namespace AtrilDocument \
--strip-prefix=Ev \
@@ -160,7 +160,7 @@ AtrilDocument-$(EV_API_VERSION).gir: libevdocument.la Makefile $(INST_H_FILES) $
--include=Gdk-2.0 \
--include=GdkPixbuf-2.0 \
--include=Gtk-2.0 \
- --library=evdocument \
+ --library=atrildocument \
--libtool="$(SAVED_LIBTOOL)" \
--output $@ \
--pkg atril-document-$(EV_API_VERSION) \
diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
index 386f3b5d..e4f9390f 100644
--- 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/libatrildocument.la \
+ $(top_builddir)/libview/libatrilview.la
-include $(top_srcdir)/git.mk
diff --git a/libview/Makefile.am b/libview/Makefile.am
index 331e8b32..4be99e61 100644
--- a/libview/Makefile.am
+++ b/libview/Makefile.am
@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libevview.la
+lib_LTLIBRARIES = libatrilview.la
NOINST_H_FILES = \
ev-annotation-window.h \
@@ -28,7 +28,7 @@ INST_H_FILES = \
headerdir = $(includedir)/atril/$(EV_API_VERSION)/libview
header_DATA = $(INST_H_FILES)
-libevview_la_SOURCES = \
+libatrilview_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 = \
+libatrilview_la_CPPFLAGS = \
-DATRILDATADIR=\"$(pkgdatadir)\" \
-DG_LOG_DOMAIN=\"AtrilView\" \
-DMATELOCALEDIR=\"$(datadir)/locale\" \
@@ -59,20 +59,20 @@ libevview_la_CPPFLAGS = \
-I$(top_builddir) \
$(AM_CPPFLAGS)
-libevview_la_CFLAGS = \
+libatrilview_la_CFLAGS = \
$(LIBVIEW_CFLAGS) \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED) \
$(AM_CFLAGS)
-libevview_la_LDFLAGS = \
+libatrilview_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 \
+libatrilview_la_LIBADD = \
+ $(top_builddir)/libdocument/libatrildocument.la \
$(LIBVIEW_LIBS)
BUILT_SOURCES = \
@@ -118,7 +118,7 @@ EXTRA_DIST = \
if ENABLE_INTROSPECTION
-AtrilView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES) $(filter %.c,$(libevview_la_SOURCES))
+AtrilView-$(EV_API_VERSION).gir: libatrilview.la Makefile $(INST_H_FILES) $(filter %.c,$(libatrilview_la_SOURCES))
$(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir):$$PKG_CONFIG_PATH \
$(G_IR_SCANNER) -v --namespace AtrilView \
--add-include-path=$(top_builddir)/libdocument \
@@ -131,7 +131,7 @@ AtrilView-$(EV_API_VERSION).gir: libevview.la Makefile $(INST_H_FILES) $(filter
--include=GdkPixbuf-2.0 \
--include=Gtk-2.0 \
--include=AtrilDocument-$(EV_API_VERSION) \
- --library=evview \
+ --library=atrilview \
--libtool="$(LIBTOOL)" \
--output $@ \
--pkg atril-document-$(EV_API_VERSION) \
diff --git a/previewer/Makefile.am b/previewer/Makefile.am
index 2ef31186..a36592f2 100644
--- a/previewer/Makefile.am
+++ b/previewer/Makefile.am
@@ -28,8 +28,8 @@ atril_previewer_LDFLAGS += -mwindows
endif
atril_previewer_LDADD = \
- $(top_builddir)/libdocument/libevdocument.la \
- $(top_builddir)/libview/libevview.la \
+ $(top_builddir)/libdocument/libatrildocument.la \
+ $(top_builddir)/libview/libatrilview.la \
$(top_builddir)/libmisc/libevmisc.la \
$(PREVIEWER_LIBS)
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 364033fa..a5462c10 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -24,7 +24,7 @@ libatril_properties_page_la_SOURCES = \
libatril_properties_page_la_LIBADD = \
libevproperties.la \
- $(top_builddir)/libdocument/libevdocument.la \
+ $(top_builddir)/libdocument/libatrildocument.la \
$(FRONTEND_LIBS) \
$(CAJA_LIBS)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 0e327912..d991a764 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -106,8 +106,8 @@ atril_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/libatrildocument.la \
+ $(top_builddir)/libview/libatrilview.la \
$(top_builddir)/libmisc/libevmisc.la \
$(SHELL_LIBS)
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
index dd1590a5..2a0b5501 100644
--- a/thumbnailer/Makefile.am
+++ b/thumbnailer/Makefile.am
@@ -25,7 +25,7 @@ atril_thumbnailer_LDFLAGS += -mwindows
endif
atril_thumbnailer_LDADD = \
- $(top_builddir)/libdocument/libevdocument.la \
+ $(top_builddir)/libdocument/libatrildocument.la \
$(FRONTEND_LIBS)
schema_files = \
@@ -39,7 +39,7 @@ if WITH_MATECONF
@INTLTOOL_SCHEMAS_RULE@
-schema_DATA =
+schema_DATA =
if ENABLE_PDF
schema_DATA += atril-thumbnailer.schemas
@@ -75,7 +75,7 @@ endif
endif # WITH_MATECONF
EXTRA_DIST = \
- $(schema_files)
+ $(schema_files)
DISTCLEANFILES = \
$(schema_DATA)
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-26 16:54:45 +0000