X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=3ca29e4f3ac3caebb1dbafbe68480d580d0050d6;hb=180cf6fef2318791abb3583f4c3f3bc176a204d8;hp=8336230f007890869122b807d56b3a1b4231fc3b;hpb=584f014b63c56fe3770cba9682fc21c31e09a2e9;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8336230f..3ca29e4f 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES=							\
-	-DDATADIR=\"$(pkgdatadir)\"				\
+	-DEVINCEDATADIR=\"$(pkgdatadir)\"				\
 	-DGNOMEDATADIR=\"$(datadir)\"				\
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\
@@ -24,9 +24,8 @@ INCLUDES=							\
 
 bin_PROGRAMS=evince
 
-libexec_PROGRAMS=evince-convert-metadata
 if ENABLE_DBUS
-libexec_PROGRAMS += evinced
+libexec_PROGRAMS = evinced
 endif
 
 evince_SOURCES=				\
@@ -34,6 +33,10 @@ evince_SOURCES=				\
 	eggfindbar.h			\
 	ev-annotation-properties-dialog.h \
 	ev-annotation-properties-dialog.c \
+	ev-bookmarks.h			\
+	ev-bookmarks.c			\
+	ev-bookmark-action.h		\
+	ev-bookmark-action.c		\
 	ev-application.c		\
 	ev-application.h		\
 	ev-file-monitor.h		\
@@ -76,6 +79,8 @@ evince_SOURCES=				\
 	ev-sidebar-annotations.h	\
 	ev-sidebar-attachments.c	\
 	ev-sidebar-attachments.h	\
+	ev-sidebar-bookmarks.h		\
+	ev-sidebar-bookmarks.c		\
 	ev-sidebar-layers.c		\
 	ev-sidebar-layers.h		\
 	ev-sidebar-links.c		\
@@ -106,8 +111,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)
 
@@ -120,18 +125,12 @@ endif
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
-evince_convert_metadata_SOURCES=	\
-	ev-convert-metadata.c
-
-evince_convert_metadata_LDADD=		\
-	$(SHELL_LIBS)
-
 if ENABLE_DBUS
 evinced_SOURCES=			\
 	ev-daemon.c
 
 evinced_CFLAGS=				\
-	-DDATADIR=\"$(pkgdatadir)\"				\
+	-DEVINCEDATADIR=\"$(pkgdatadir)\"			\
 	-DGNOMEDATADIR=\"$(datadir)\"				\
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\