Fix DBUS configure checks.

[evince.git] / shell / Makefile.am

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 71faed511f7088bfd1f492159323e49a23dec1e1..24e3ab66e52f16407ba6de88147df3bf4f23d3e3 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -8,12 +8,7 @@ INCLUDES=                                              \
        -I$(top_srcdir)/cut-n-paste/zoom-control/       \
        -I$(top_srcdir)/cut-n-paste/toolbar-editor/     \
        -I$(top_srcdir)/backend                         \
-       -I$(top_srcdir)/pdf                             \
-       -I$(top_srcdir)/pixbuf                          \
-       -I$(top_srcdir)/tiff                            \
-       -I$(top_srcdir)/ps                              \
-       -I$(top_srcdir)/djvu                            \
-       -I$(top_srcdir)/dvi                             \
+       -I$(top_srcdir)/properties                      \
        -DGNOMELOCALEDIR=\"$(datadir)/locale\"          \
        -DGNOMEICONDIR=\""$(datadir)/pixmaps"\"         \
        $(SHELL_CFLAGS)                                 \
@@ -27,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           \
@@ -62,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                       \
@@ -82,8 +77,10 @@ evince_SOURCES=                              \
        ev-pixbuf-cache.h               \
        ev-print-job.c                  \
        ev-print-job.h                  \
-       ev-properties.c                 \
-       ev-properties.h                 \
+       ev-properties-dialog.c          \
+       ev-properties-dialog.h          \
+       ev-properties-fonts.c           \
+       ev-properties-fonts.h           \
        ev-utils.c                      \
        ev-utils.h                      \
        ev-view.c                       \
@@ -117,6 +114,7 @@ evince_LDADD=                                                               \
        $(top_builddir)/cut-n-paste/zoom-control/libephymisc.la         \
        $(top_builddir)/cut-n-paste/zoom-control/libephywidgets.la      \
        $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la  \
+       $(top_builddir)/properties/libevproperties.la                   \
        $(top_builddir)/lib/libev.la                                    \
        -ltiff -lz                                                      \
        libevbackendfactory.la                                          \
@@ -132,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
@@ -141,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