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 b301374ba112627ddebce48de3992d2f6e460926..3d857716858fa66c75760a9605d87d7cd4d8e56b 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -5,19 +5,24 @@ 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/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)/cut-n-paste/evmountoperation/   \

        -I$(top_srcdir)/libdocument                     \
        -I$(top_srcdir)/properties                      \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"         \
        $(SHELL_CFLAGS)                                 \
        $(WARN_CFLAGS)                                  \
        -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
 
 
 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                    \
 evince_SOURCES=                                \
        eggfindbar.c                    \
        eggfindbar.h                    \


@@ -27,10 +32,13 @@ evince_SOURCES=                             \
        ev-job-queue.c                  \
        ev-jobs.h                       \
        ev-jobs.c                       \
        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                    \
        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-message-area.c               \
        ev-message-area.h               \
        ev-metadata-manager.c           \


@@ -84,27 +92,19 @@ evince_SOURCES=                             \
        ev-timeline.h                   \
        ev-tooltip.c                    \
        ev-tooltip.h                    \
        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       \
 
 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)/cut-n-paste/evmountoperation/libevmountoperation.la     \

        $(top_builddir)/properties/libevproperties.la                           \
        $(top_builddir)/libdocument/libevbackend.la                             \
        $(top_builddir)/properties/libevproperties.la                           \
        $(top_builddir)/libdocument/libevbackend.la                             \

-       $(SHELL_LIBS)                                                           \
-       $(GNOME_PRINT_LIBS)
+       $(SHELL_LIBS)

 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 


@@ -113,7 +113,8 @@ BUILT_SOURCES += ev-application-service.h
 endif
 
 EXTRA_DIST = ev-marshal.list           \
 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
 
 
 ev-marshal.h: $(srcdir)/ev-marshal.list