[dualscreen] licence fix

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 0175b5a22805ca791b34ce0a354ce1369b98b0fd..008037e41ecbd0744cf62a645268de6bc131871c 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,12 +1,11 @@
 INCLUDES=                                                      \
-       -DDATADIR=\"$(pkgdatadir)\"                             \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"                               \
        -DGNOMEDATADIR=\"$(datadir)\"                           \
        -I$(top_srcdir)                                         \
        -I$(top_builddir)                                       \
        -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/smclient/                   \
        -I$(top_srcdir)/libdocument                             \
@@ -15,8 +14,9 @@ INCLUDES=                                                     \
        -I$(top_builddir)/libview                               \
        -I$(top_srcdir)/libmisc                                 \
        -I$(top_srcdir)/properties                              \
-       -DGNOMELOCALEDIR=\"$(datadir)/locale\"                  \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"                 \
+       -DBINDIR=\""$(bindir)"\"                                \
+       -DLIBEXECDIR=\""$(libexecdir)"\"                        \
        -DEVINCE_COMPILATION                                    \
        $(SHELL_CFLAGS)                                         \
        $(WARN_CFLAGS)                                          \
@@ -24,18 +24,23 @@ 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)
+libexec_PROGRAMS = evinced
 endif
 
 evince_SOURCES=                                \
        eggfindbar.c                    \
        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                    \
@@ -44,25 +49,24 @@ evince_SOURCES=                             \
        ev-keyring.c                    \
        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-metadata.c                   \
+       ev-metadata.h                   \
        ev-navigation-action.c          \
        ev-navigation-action.h          \
        ev-navigation-action-widget.c   \
        ev-navigation-action-widget.h   \
        ev-password-view.h              \
        ev-password-view.c              \
-       ev-print-operation.h            \
-       ev-print-operation.c            \
        ev-progress-message-area.h      \
        ev-progress-message-area.c      \
        ev-properties-dialog.c          \
        ev-properties-dialog.h          \
        ev-properties-fonts.c           \
        ev-properties-fonts.h           \
+       ev-properties-license.c         \
+       ev-properties-license.h         \
        ev-open-recent-action.c         \
        ev-open-recent-action.h         \
        ev-utils.c                      \
@@ -73,8 +77,12 @@ evince_SOURCES=                              \
        ev-window-title.h               \
        ev-sidebar.c                    \
        ev-sidebar.h                    \
+       ev-sidebar-annotations.c        \
+       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              \
@@ -85,6 +93,15 @@ evince_SOURCES=                              \
        ev-sidebar-thumbnails.h         \
        main.c
 
+if ENABLE_DBUS
+evince_SOURCES += \
+       ev-media-player-keys.c \
+       ev-media-player-keys.h \
+       ev-presentation-timer.h \
+       ev-presentation-timer.c
+endif
+
+
 evince_LDFLAGS = $(AM_LDFLAGS)
 
 if PLATFORM_WIN32
@@ -95,25 +112,44 @@ 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/smclient/libsmclient.la                             \
        $(top_builddir)/properties/libevproperties.la                                   \
-       $(top_builddir)/libdocument/libevdocument.la                                    \
-       $(top_builddir)/libview/libevview.la                                            \
+       $(top_builddir)/libdocument/libevdocument3.la                                   \
+       $(top_builddir)/libview/libevview3.la                                           \
        $(top_builddir)/libmisc/libevmisc.la                                            \
        $(SHELL_LIBS)
 
+if PLATFORM_WIN32
+evince_LDADD += evince-icon.o
+
+evince-icon.o: $(srcdir)/evince-icon.rc $(top_srcdir)/data/evince.ico
+       $(WINDRES) $(srcdir)/evince-icon.rc -I $(top_srcdir)/data evince-icon.o
+endif
+
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
 if ENABLE_DBUS
-BUILT_SOURCES += ev-application-service.h
+evinced_SOURCES=                       \
+       ev-daemon.c
+
+evinced_CFLAGS=                                \
+       -DEVINCEDATADIR=\"$(pkgdatadir)\"                       \
+       -DGNOMEDATADIR=\"$(datadir)\"                           \
+       -I$(top_srcdir)                                         \
+       -I$(top_builddir)                                       \
+       -DLIBEXECDIR=\""$(libexecdir)"\"                        \
+       -DEVINCE_COMPILATION                                    \
+       $(EV_DAEMON_CFLAGS)                                     \
+       $(WARN_CFLAGS)                                          \
+       $(DISABLE_DEPRECATED)
+
+evinced_LDADD=                         \
+       $(EV_DAEMON_LIBS)
 endif
 
 EXTRA_DIST = ev-marshal.list           \
-       ev-application-service.xml      \
-       $(EV_MEDIA_PLAYER_KEYS_SOURCES)
-
+       evince-icon.rc
 
 ev-marshal.h: $(srcdir)/ev-marshal.list
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --header > ev-marshal.h
@@ -122,8 +158,6 @@ ev-marshal.c: $(srcdir)/ev-marshal.list
        echo '#include "ev-marshal.h"' > ev-marshal.c
        $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=ev_marshal $(srcdir)/ev-marshal.list --body >> ev-marshal.c
 
-DISTCLEANFILES= \
-       ev-application-service.h
+DISTCLEANFILES =
 
-ev-application-service.h: $(srcdir)/ev-application-service.xml
-       $(AM_V_GEN)dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+-include $(top_srcdir)/git.mk