X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=help%2Freference%2Fshell%2FMakefile.am;h=aceb2c825957d295e48b0656ead0731de579ca23;hb=b03015826c22cb2c28a0d0507963c23b9c9ddcb3;hp=948d4b1f1a899ddd6b854c2e062ea33ff4b0987f;hpb=0ce9b3563b591c5fe980bcf47108a3f1b6dc6a85;p=evince.git

diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am
index 948d4b1f..aceb2c82 100644
--- 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 --source-dir=../../../libmisc
+DOC_SOURCE_DIR = $(top_srcdir)/shell
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS =
@@ -34,7 +34,7 @@ MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=ev
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS =--source-dir=../../../libmisc
+# MKTMPL_OPTIONS =
 
 # Extra options to supply to gtkdoc-mkhtml
 # Add the builddir to the HTML path so that version.xml is found
@@ -52,15 +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 \
-	$(top_srcdir)/libmisc/*.h \
-	$(top_builddir)/libmisc/*.h
-
-CFILE_GLOB = \
-	$(top_srcdir)/shell/*.c \
-	$(top_srcdir)/libmisc/*.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
@@ -71,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
@@ -82,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
@@ -108,7 +99,7 @@ GTKDOC_CFLAGS = \
 	-I$(top_srcdir)/libmisc				\
 	-I$(top_builddir)/libview			\
 	-I$(top_srcdir)/properties			\
-	-DDATADIR=\"$(pkgdatadir)\"			\
+	-DEVINCEDATADIR=\"$(pkgdatadir)\"		\
 	-DGNOMEDATADIR=\"$(datadir)\"			\
 	-DGNOMELOCALEDIR=\"$(datadir)/locale\"		\
 	-DGNOMEICONDIR=\""$(datadir)/pixmaps"\" 	\
@@ -127,12 +118,11 @@ 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/evinfobar/libevinfobar.la		\
 	$(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la	\
 	$(top_builddir)/cut-n-paste/smclient/libsmclient.la		\
 	$(top_builddir)/properties/libevproperties.la			\
-	$(top_builddir)/libdocument/libevdocument.la			\
-	$(top_builddir)/libview/libevview.la				\
+	$(top_builddir)/libdocument/libevdocument3.la			\
+	$(top_builddir)/libview/libevview3.la				\
 	$(top_builddir)/libmisc/libevmisc.la				\
 	$(SHELL_LIBS)							\
 	$(GTK_PRINT_LIBS)						\