X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2FMakefile.am;h=af105eb6f20c282a119d1b4e155c25a56351ba66;hb=3eb988973d60bcfc1eb15752ff61f248775701f5;hp=b2bc86d8d7eff0133e083d25e6574ca201f17aac;hpb=b81ab84ffbb263771071c9ed79350dbb4017a17b;p=evince.git diff --git a/shell/Makefile.am b/shell/Makefile.am index b2bc86d8..af105eb6 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -30,13 +30,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 \ @@ -91,6 +84,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 @@ -118,10 +118,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 @@ -129,8 +125,6 @@ evince_convert_metadata_LDADD= \ $(SHELL_LIBS) if ENABLE_DBUS -BUILT_SOURCES += ev-daemon-service.h - evinced_SOURCES= \ ev-daemon.c @@ -150,11 +144,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 @@ -163,14 +153,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