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=b1dafd7a20f1e5e6da9f83770bf87a580b7eb2d1;hb=c077e7131bdd63aeaee762b69d77f3881ff496b1;hp=b301374ba112627ddebce48de3992d2f6e460926;hpb=e2454047ecb9509ea4439ad8e0cb0d1697db260d;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index b301374b..b1dafd7a 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,36 +1,46 @@
-INCLUDES=						\
-	-DDATADIR=\"$(pkgdatadir)\"			\
-	-DGNOMEDATADIR=\"$(datadir)\"			\
-	-I$(top_srcdir)/cut-n-paste/zoom-control/	\
-	-I$(top_srcdir)/cut-n-paste/toolbar-editor/	\
-	-I$(top_srcdir)/cut-n-paste/totem-screensaver/	\
-	-I$(top_srcdir)/cut-n-paste/gedit-message-area/	\
-	-I$(top_srcdir)/cut-n-paste/fileformatchooser/	\
-	-I$(top_srcdir)/libdocument			\
-	-I$(top_srcdir)/properties			\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
-	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
-	$(SHELL_CFLAGS)					\
-	$(WARN_CFLAGS)					\
-	$(DISABLE_DEPRECATED)				\
-	$(GNOME_PRINT_CFLAGS)				\
-	$(GTK_PRINT_CFLAGS)
+INCLUDES=							\
+	-DDATADIR=\"$(pkgdatadir)\"				\
+	-DGNOMEDATADIR=\"$(datadir)\"				\
+	-I$(top_srcdir)/cut-n-paste/zoom-control/		\
+	-I$(top_srcdir)/cut-n-paste/toolbar-editor/		\
+	-I$(top_srcdir)/cut-n-paste/totem-screensaver/		\
+	-I$(top_srcdir)/cut-n-paste/gedit-message-area/		\
+	-I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/	\
+	-I$(top_srcdir)/cut-n-paste/evmountoperation/		\
+	-I$(top_srcdir)/cut-n-paste/smclient/			\
+	-I$(top_srcdir)/libdocument				\
+	-I$(top_srcdir)/properties				\
+	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
+	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
+	$(SHELL_CFLAGS)						\
+	$(WARN_CFLAGS)						\
+	$(DISABLE_DEPRECATED)
 
 bin_PROGRAMS=evince
 
+EV_MEDIA_PLAYER_KEYS_SOURCES = ev-media-player-keys.c ev-media-player-keys.h
+if ENABLE_DBUS
+DBUS_SOURCES = $(EV_MEDIA_PLAYER_KEYS_SOURCES)
+else
+DBUS_SOURCES = $(null)
+endif
+
 evince_SOURCES=				\
 	eggfindbar.c			\
 	eggfindbar.h			\
 	ev-application.c		\
 	ev-application.h		\
-	ev-job-queue.h			\
-	ev-job-queue.c			\
+	ev-job-scheduler.h		\
+	ev-job-scheduler.c		\
 	ev-jobs.h			\
 	ev-jobs.c			\
+	ev-file-monitor.h		\
+	ev-file-monitor.c		\
 	ev-history.c			\
 	ev-history.h			\
 	ev-marshal.c			\
 	ev-marshal.h			\
+	$(DBUS_SOURCES)			\
 	ev-message-area.c		\
 	ev-message-area.h		\
 	ev-metadata-manager.c		\
@@ -72,6 +82,8 @@ evince_SOURCES=				\
 	ev-sidebar.h			\
 	ev-sidebar-attachments.c	\
 	ev-sidebar-attachments.h	\
+	ev-sidebar-layers.c		\
+	ev-sidebar-layers.h		\
 	ev-sidebar-links.c		\
 	ev-sidebar-links.h		\
 	ev-sidebar-page.c		\
@@ -82,29 +94,21 @@ evince_SOURCES=				\
 	ev-stock-icons.h		\
 	ev-timeline.c			\
 	ev-timeline.h			\
-	ev-tooltip.c			\
-	ev-tooltip.h			\
-	main.c				\
-	xdg-user-dir-lookup.c
-
-
-if WITH_GNOME_PRINT
-evince_SOURCES+=			\
-	ev-print-job.c			\
-	ev-print-job.h
-endif
-
+	ev-transition-animation.c	\
+	ev-transition-animation.h	\
+	main.c
 
-evince_LDADD=									\
-	$(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la			\
-	$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la		\
-	$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la	\
-	$(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la	\
-	$(top_builddir)/cut-n-paste/fileformatchooser/libfileformatchooser.la \
-	$(top_builddir)/properties/libevproperties.la				\
-	$(top_builddir)/libdocument/libevbackend.la				\
-	$(SHELL_LIBS)								\
-	$(GNOME_PRINT_LIBS)
+evince_LDADD=										\
+	$(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la				\
+	$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la			\
+	$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la		\
+	$(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la		\
+	$(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la	\
+	$(top_builddir)/cut-n-paste/evmountoperation/libevmountoperation.la		\
+	$(top_builddir)/cut-n-paste/smclient/libsmclient.la				\
+	$(top_builddir)/properties/libevproperties.la					\
+	$(top_builddir)/libdocument/libevbackend.la					\
+	$(SHELL_LIBS)
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
@@ -113,7 +117,8 @@ BUILT_SOURCES += ev-application-service.h
 endif
 
 EXTRA_DIST = ev-marshal.list		\
-	ev-application-service.xml
+	ev-application-service.xml	\
+	$(EV_MEDIA_PLAYER_KEYS_SOURCES)
 
 
 ev-marshal.h: $(srcdir)/ev-marshal.list