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=f4da6818d245fa826438508edd8c60586badaaa5;hb=1c2d9608d0d3dee305e1556525fc8c04db24a916;hp=16f30340428adc118b4c479ce1d7f3fcb67bc173;hpb=45467f0d8a4dacfe4209fba0a605e86b2b2e9b80;p=evince.git

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 16f30340..f4da6818 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				\
@@ -15,7 +14,6 @@ INCLUDES=							\
 	-I$(top_builddir)/libview				\
 	-I$(top_srcdir)/libmisc					\
 	-I$(top_srcdir)/properties				\
-	-DGNOMELOCALEDIR=\"$(datadir)/locale\"			\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 		\
 	-DBINDIR=\""$(bindir)"\"				\
 	-DLIBEXECDIR=\""$(libexecdir)"\"			\
@@ -31,13 +29,6 @@ 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
-DBUS_SOURCES = $(EV_MEDIA_PLAYER_KEYS_SOURCES)
-else
-DBUS_SOURCES = $(null)
-endif
-
 evince_SOURCES=				\
 	eggfindbar.c			\
 	eggfindbar.h			\
@@ -92,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
@@ -102,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					\
@@ -120,10 +117,6 @@ endif
 
 BUILT_SOURCES = ev-marshal.h ev-marshal.c
 
-if ENABLE_DBUS
-BUILT_SOURCES += ev-application-service.h
-endif
-
 evince_convert_metadata_SOURCES=	\
 	ev-convert-metadata.c
 
@@ -131,8 +124,6 @@ evince_convert_metadata_LDADD=		\
 	$(SHELL_LIBS)
 
 if ENABLE_DBUS
-BUILT_SOURCES += ev-daemon-service.h
-
 evinced_SOURCES=			\
 	ev-daemon.c
 
@@ -152,11 +143,7 @@ evinced_LDADD=				\
 endif
 
 EXTRA_DIST = ev-marshal.list		\
-	ev-application-service.xml	\
-	ev-daemon-service.xml		\
-	evince-icon.rc			\
-	$(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
@@ -165,14 +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	\
-	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
+DISTCLEANFILES =
 
 -include $(top_srcdir)/git.mk