X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=inline;f=help%2Freference%2Fshell%2FMakefile.am;h=c2e18c011b0489869471d1cdcbab9222aad1a8b4;hb=e63cb09538113fa2695bc2877902702109eed303;hp=a8d66711ed719b563a93b3b3710b62745ea92ebf;hpb=8c8331a520f5aed92d3ad56c4b0a84a355b305f2;p=evince.git

diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am
index a8d66711..c2e18c01 100644
--- a/help/reference/shell/Makefile.am
+++ b/help/reference/shell/Makefile.am
@@ -35,6 +35,9 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
 MKTMPL_OPTIONS=--source-dir=../../../libmisc
 
+# Add the builddir to the HTML path so that version.xml is found
+MKHTML_OPTIONS=--path="$(abs_builddir)"
+
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
 FIXXREF_OPTIONS=
@@ -92,11 +95,16 @@ INCLUDES= \
 	$(DISABLE_DEPRECATED)				\
 	$(GTK_PRINT_CFLAGS)
 
+FILTER_OUT = \
+	$(top_builddir)/shell/main.o			\
+	$(top_builddir)/shell/evinced-ev-daemon.o	\
+	$(top_builddir)/shell/ev-convert-metadata.o
+
 GTKDOC_LIBS= \
 	$(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la		\
 	$(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la	\
 	$(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la	\
-	$(top_builddir)/cut-n-paste/gedit-message-area/libgeditmsgarea.la	\
+	$(top_builddir)/cut-n-paste/evinfobar/libevinfobar.la		\
 	$(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la	\
 	$(top_builddir)/cut-n-paste/smclient/libsmclient.la		\
 	$(top_builddir)/properties/libevproperties.la			\
@@ -105,7 +113,7 @@ GTKDOC_LIBS= \
 	$(top_builddir)/libmisc/libevmisc.la				\
 	$(SHELL_LIBS)							\
 	$(GTK_PRINT_LIBS)						\
-	$(filter-out ../../../shell/main.o,$(wildcard ../../../shell/*.o))
+	$(filter-out $(FILTER_OUT),$(wildcard $(top_builddir)/shell/*.o))
 
 if ENABLE_DJVU
 GTKDOC_LIBS +=	$(DJVU_LIBS)
@@ -125,3 +133,5 @@ include $(top_srcdir)/gtk-doc.make
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
 EXTRA_DIST += version.xml.in
+
+-include $(top_srcdir)/git.mk