Fixes bug #542924. Makes enums static to fix Solaris build.

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index f4b3e0a6f74afafe29903933760cdcae7075c4a5..3d857716858fa66c75760a9605d87d7cd4d8e56b 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -5,6 +5,7 @@ INCLUDES=                                               \
        -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)/libdocument                     \
        -I$(top_srcdir)/properties                      \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
@@ -15,6 +16,13 @@ INCLUDES=                                            \
 
 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                    \
@@ -24,10 +32,13 @@ evince_SOURCES=                             \
        ev-job-queue.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           \
@@ -90,6 +101,7 @@ evince_LDADD=                                                                        \
        $(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/evmountoperation/libevmountoperation.la     \
        $(top_builddir)/properties/libevproperties.la                           \
        $(top_builddir)/libdocument/libevbackend.la                             \
        $(SHELL_LIBS)
@@ -101,7 +113,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