Remove some code duplication

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7a4489e8ee8c2a53adcafe363f642ca80c31c25b..f4da6818d245fa826438508edd8c60586badaaa5 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -6,7 +6,6 @@ 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/evinfobar/                  \
        -I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/     \
        -I$(top_srcdir)/cut-n-paste/smclient/                   \
        -I$(top_srcdir)/libdocument                             \
@@ -15,8 +14,8 @@ 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)                                         \
@@ -26,12 +25,8 @@ INCLUDES=                                                    \
 bin_PROGRAMS=evince
 
 libexec_PROGRAMS=evince-convert-metadata
-
-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=                                \
@@ -52,22 +47,20 @@ evince_SOURCES=                             \
        ev-message-area.h               \
        ev-metadata.c                   \
        ev-metadata.h                   \
-       ev-metadata-manager.c           \
-       ev-metadata-manager.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                      \
@@ -90,6 +83,13 @@ evince_SOURCES=                              \
        ev-sidebar-thumbnails.h         \
        main.c
 
+if ENABLE_DBUS
+evince_SOURCES += \
+       ev-media-player-keys.c \
+       ev-media-player-keys.h
+endif
+
+
 evince_LDFLAGS = $(AM_LDFLAGS)
 
 if PLATFORM_WIN32
@@ -100,7 +100,6 @@ 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/evinfobar/libevinfobar.la                           \
        $(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \
        $(top_builddir)/cut-n-paste/smclient/libsmclient.la                             \
        $(top_builddir)/properties/libevproperties.la                                   \
@@ -109,24 +108,42 @@ evince_LDADD=                                                                             \
        $(top_builddir)/libmisc/libevmisc.la                                            \
        $(SHELL_LIBS)
 
-BUILT_SOURCES = ev-marshal.h ev-marshal.c
+if PLATFORM_WIN32
+evince_LDADD += evince-icon.o
 
-if ENABLE_DBUS
-BUILT_SOURCES += ev-application-service.h
+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
+
 evince_convert_metadata_SOURCES=       \
        ev-convert-metadata.c
 
 evince_convert_metadata_LDADD=         \
        $(SHELL_LIBS)
 
+if ENABLE_DBUS
+evinced_SOURCES=                       \
+       ev-daemon.c
+
+evinced_CFLAGS=                                \
+       -DDATADIR=\"$(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
@@ -135,8 +152,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