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=16eeaf1a7d63a1c603a4159581739ad4be2dbea6;hb=94cb89c0c9cbefaadaa067062fe7ea461f9a8d64;hp=6964029d0df098fa7d0d397df829f38297126b82;hpb=f75f5694d713ead3d2942127ad0dfeb7259a0357;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 6964029d..16eeaf1a 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -4,31 +4,44 @@ INCLUDES=						\
 	-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/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)				\
-	$(GNOME_PRINT_CFLAGS)				\
-	$(GTK_PRINT_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		\
 	ev-metadata-manager.h		\
 	ev-navigation-action.c		\
@@ -51,6 +64,8 @@ evince_SOURCES=				\
 	ev-properties-dialog.h		\
 	ev-properties-fonts.c		\
 	ev-properties-fonts.h		\
+	ev-open-recent-action.c		\
+	ev-open-recent-action.h		\
 	ev-utils.c			\
 	ev-utils.h			\
 	ev-view-accessible.c		\
@@ -74,39 +89,24 @@ evince_SOURCES=				\
 	ev-sidebar-thumbnails.h		\
 	ev-stock-icons.c		\
 	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	\
+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)/properties/libevproperties.la			\
-	$(top_builddir)/libdocument/libevbackend.la			\
-	$(SHELL_LIBS)							\
-	$(GNOME_PRINT_LIBS)
-
-if ENABLE_DJVU
-evince_LDADD +=	$(DJVU_LIBS)
-endif
-
-if ENABLE_DVI
-evince_LDADD +=	-lkpathsea
-endif
-
-if WITH_TYPE1_FONTS
-evince_LDADD += -lt1
-endif
+	$(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.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
 
@@ -115,7 +115,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