X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=shell%2FMakefile.am;h=94488b9844d8a65777f9b64eebd147c00895bb61;hb=d52ff81f97f4bd3794e1517443096846baee068b;hp=c801b7819a261c964032a5382c0c931651d19598;hpb=eb65999fbc7173f07731461c97e6be2a1d8467ce;p=evince.git diff --git a/shell/Makefile.am b/shell/Makefile.am index c801b781..94488b98 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -14,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)"\" \ @@ -30,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 \ @@ -50,7 +42,6 @@ evince_SOURCES= \ ev-keyring.c \ ev-marshal.c \ ev-marshal.h \ - $(DBUS_SOURCES) \ ev-message-area.c \ ev-message-area.h \ ev-metadata.c \ @@ -91,6 +82,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 @@ -144,8 +142,7 @@ evinced_LDADD= \ endif EXTRA_DIST = ev-marshal.list \ - 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