X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2FMakefile.am;h=7e3cf8c93e7cc0e4ec1553abf93b2362d668b1a3;hb=04766ed2f064192b4a8eb3fb6a81a1bd020a139f;hp=523d299fb94a632929109f805024b6f9a92837dd;hpb=c497b6a969f916a476d0bb01e38ff6584ff4bfe5;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 523d299f..7e3cf8c9 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,14 +24,15 @@ INCLUDES=							\
 
 bin_PROGRAMS=evince
 
-libexec_PROGRAMS=evince-convert-metadata
 if ENABLE_DBUS
-libexec_PROGRAMS += evinced
+libexec_PROGRAMS = evinced
 endif
 
 evince_SOURCES=				\
 	eggfindbar.c			\
 	eggfindbar.h			\
+	ev-annotation-properties-dialog.h \
+	ev-annotation-properties-dialog.c \
 	ev-application.c		\
 	ev-application.h		\
 	ev-file-monitor.h		\
@@ -104,8 +105,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)
 
@@ -118,18 +119,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)					\