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=2eff97f442f3ec7f4b4019d488ef524805c8fedb;hb=5f554d8e362a35e05840068e1b3ea935be5d3c47;hp=7a4489e8ee8c2a53adcafe363f642ca80c31c25b;hpb=cdbc65b6566faa422bab219c0b60d30d0093eaeb;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7a4489e8..2eff97f4 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -17,6 +17,7 @@ INCLUDES=							\
 	-I$(top_srcdir)/properties				\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
+	-DBINDIR=\""$(bindir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
 	-DEVINCE_COMPILATION					\
 	$(SHELL_CFLAGS)						\
@@ -26,6 +27,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
@@ -52,8 +56,6 @@ 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	\
@@ -68,6 +70,8 @@ evince_SOURCES=				\
 	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			\
@@ -121,10 +125,30 @@ 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		\
 	$(EV_MEDIA_PLAYER_KEYS_SOURCES)
 
 
@@ -135,8 +159,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