[doc] Fix shell api docs build

diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am
index 373ab0ce17670ae580e0cda20d1b5bf327d0fa4f..3d267d5094c9baa1b968374865c6615ebe670f3b 100644 (file)
--- a/help/reference/shell/Makefile.am
+++ b/help/reference/shell/Makefile.am
@@ -19,7 +19,7 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # evinceing the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR = ../../../shell
+DOC_SOURCE_DIR = $(top_srcdir)/shell
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS =
@@ -52,12 +52,8 @@ FIXXREF_OPTIONS = \
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB = \
-       $(top_srcdir)/shell/*.h \
-       $(top_builddir)/shell/*.h
-
-CFILE_GLOB = \
-       $(top_srcdir)/shell/*.c
+HFILE_GLOB = $(top_srcdir)/shell/*.h
+CFILE_GLOB = $(top_srcdir)/shell/*.c
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
@@ -68,9 +64,7 @@ EXTRA_HFILES =
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES = \
        config.h \
-       ev-marshal.h \
-       ev-application-service.h \
-       ev-daemon-service.h
+       ev-marshal.h
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
@@ -79,7 +73,7 @@ HTML_IMAGES =
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
 content_files = \
-       version.xml
+       version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files

diff --git a/shell/Makefile.am b/shell/Makefile.am
index f4da6818d245fa826438508edd8c60586badaaa5..94488b9844d8a65777f9b64eebd147c00895bb61 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -42,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                   \