Fix DBUS configure checks.

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 7dc939ff98e603a0fcac1b64f15c51b2fa88881c..24e3ab66e52f16407ba6de88147df3bf4f23d3e3 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -22,9 +22,7 @@ endif
 bin_PROGRAMS=evince
 noinst_LTLIBRARIES = libevbackendfactory.la
 
-libevbackendfactory_la_SOURCES=                        \
-       ev-document-types.c                             \
-       ev-document-types.h
+libevbackendfactory_la_SOURCES =
 
 libevbackendfactory_la_LIBADD =                        \
        $(top_builddir)/pdf/libpdfdocument.la           \
@@ -57,6 +55,8 @@ evince_SOURCES=                               \
        eggfindbar.h                    \
        ev-application.c                \
        ev-application.h                \
+       ev-document-types.c             \
+       ev-document-types.h             \
        ev-job-queue.h                  \
        ev-job-queue.c                  \
        ev-jobs.h                       \
@@ -130,7 +130,8 @@ if ENABLE_DBUS
 BUILT_SOURCES += ev-application-service.h
 endif
 
-EXTRA_DIST = ev-marshal.list
+EXTRA_DIST = ev-marshal.list \
+            ev-application-service.h
 
 ev-marshal.h: ev-marshal.list
        glib-genmarshal --prefix=ev_marshal ev-marshal.list --header > ev-marshal.h
@@ -139,5 +140,10 @@ ev-marshal.c: ev-marshal.list
        echo '#include "ev-marshal.h"' > ev-marshal.c
        glib-genmarshal --prefix=ev_marshal ev-marshal.list --body >> ev-marshal.c
 
+if DBUS_TOOL_NO_PREFIX
 ev-application-service.h: ev-application-service.xml
        dbus-binding-tool --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+else
+ev-application-service.h: ev-application-service.xml
+       dbus-binding-tool --prefix=ev_application --mode=glib-server --output=ev-application-service.h $(srcdir)/ev-application-service.xml
+endif