[dualscreen] fix crash on ctrl+w and fix control window closing

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index f729c363cafe6fcededafe62239021e281a1ddd4..008037e41ecbd0744cf62a645268de6bc131871c 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -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,8 +33,14 @@ 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-dualscreen.h                 \
+       ev-dualscreen.c                 \
        ev-file-monitor.h               \
        ev-file-monitor.c               \
        ev-history.c                    \
@@ -76,6 +81,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              \
@@ -89,7 +96,9 @@ evince_SOURCES=                               \
 if ENABLE_DBUS
 evince_SOURCES += \
        ev-media-player-keys.c \
-       ev-media-player-keys.h
+       ev-media-player-keys.h \
+       ev-presentation-timer.h \
+       ev-presentation-timer.c
 endif
 
 
@@ -120,12 +129,6 @@ 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