X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2FMakefile.am;h=b2bc86d8d7eff0133e083d25e6574ca201f17aac;hb=bd26e60016e9e08c1784ee2d90695cc7eeb7daee;hp=3b4f6f75cd1a323b6d17278609f3e6b720503be0;hpb=557d2c4d2134223fc27a486561462fe35bb19f5d;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 3b4f6f75..b2bc86d8 100644
--- 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				\
@@ -17,6 +16,7 @@ INCLUDES=							\
 	-I$(top_srcdir)/properties				\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
+	-DBINDIR=\""$(bindir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
 	-DEVINCE_COMPILATION					\
 	$(SHELL_CFLAGS)						\
@@ -26,6 +26,9 @@ INCLUDES=							\
 bin_PROGRAMS=evince
 
 libexec_PROGRAMS=evince-convert-metadata
+if ENABLE_DBUS
+libexec_PROGRAMS += evinced
+endif
 
 EV_MEDIA_PLAYER_KEYS_SOURCES = ev-media-player-keys.c ev-media-player-keys.h
 if ENABLE_DBUS
@@ -58,14 +61,14 @@ evince_SOURCES=				\
 	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			\
@@ -98,7 +101,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					\
@@ -107,6 +109,13 @@ evince_LDADD=										\
 	$(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
@@ -119,10 +128,31 @@ evince_convert_metadata_SOURCES=	\
 evince_convert_metadata_LDADD=		\
 	$(SHELL_LIBS)
 
+if ENABLE_DBUS
+BUILT_SOURCES += ev-daemon-service.h
+
+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-daemon-service.xml		\
+	evince-icon.rc			\
 	$(EV_MEDIA_PLAYER_KEYS_SOURCES)
 
 
@@ -133,8 +163,14 @@ 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	\
+	ev-daemon-service.h
 
 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
+
+ev-daemon-service.h: $(srcdir)/ev-daemon-service.xml
+	$(AM_V_GEN)dbus-binding-tool --prefix=ev_daemon --mode=glib-server --output=ev-daemon-service.h $(srcdir)/ev-daemon-service.xml
+
+-include $(top_srcdir)/git.mk