X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=f729c363cafe6fcededafe62239021e281a1ddd4;hb=671655393d655c3ab62fdf671beec9922b7ec7f1;hp=af105eb6f20c282a119d1b4e155c25a56351ba66;hpb=3eb988973d60bcfc1eb15752ff61f248775701f5;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index af105eb6..f729c363 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)					\
@@ -14,7 +14,6 @@ INCLUDES=							\
 	-I$(top_builddir)/libview				\
 	-I$(top_srcdir)/libmisc					\
 	-I$(top_srcdir)/properties				\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
 	-DBINDIR=\""$(bindir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
@@ -33,6 +32,8 @@ 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		\
@@ -43,7 +44,6 @@ evince_SOURCES=				\
 	ev-keyring.c			\
 	ev-marshal.c			\
 	ev-marshal.h			\
-	$(DBUS_SOURCES)			\
 	ev-message-area.c		\
 	ev-message-area.h		\
 	ev-metadata.c			\
@@ -72,6 +72,8 @@ evince_SOURCES=				\
 	ev-window-title.h		\
 	ev-sidebar.c			\
 	ev-sidebar.h			\
+	ev-sidebar-annotations.c	\
+	ev-sidebar-annotations.h	\
 	ev-sidebar-attachments.c	\
 	ev-sidebar-attachments.h	\
 	ev-sidebar-layers.c		\
@@ -104,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)
 
@@ -129,7 +131,7 @@ evinced_SOURCES=			\
 	ev-daemon.c
 
 evinced_CFLAGS=				\
-	-DDATADIR=\"$(pkgdatadir)\"				\
+	-DEVINCEDATADIR=\"$(pkgdatadir)\"			\
 	-DGNOMEDATADIR=\"$(datadir)\"				\
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\