X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=docs%2Freference%2FMakefile.am;h=7fd58a2acb15e6947a4fa7e452e3b2cd09381ca7;hb=7cbc2c68d146433b1d438d60406ca05e14a523ce;hp=c039fb8abe30699da72028164e47292e646c9a02;hpb=15cf636ad56b502202b4f0d005c12b256d7c5680;p=projects%2Fchimara%2Fchimara.git

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index c039fb8..7fd58a2 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -34,7 +34,11 @@ MKTMPL_OPTIONS =
 
 # Extra options to supply to gtkdoc-mkhtml
 # The --path is because Gtk-doc is broken on non-distcheck vpath builds! Sigh.
-MKHTML_OPTIONS = --path="$(abs_builddir)"
+# But it only works on Gtk-doc 1.11 and higher. So if you want to do a vpath
+# build then uncomment this and require 1.11 in configure.ac. If you want to do
+# vpath build on Debian, then you're S.O.L. Complain to Gtk-doc and Debian.
+# MKHTML_OPTIONS = --path="$(abs_builddir)"
+MKHTML_OPTIONS = 
 
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 FIXXREF_OPTIONS = 
@@ -47,8 +51,9 @@ CFILE_GLOB = $(top_srcdir)/libchimara/*.c
 EXTRA_HFILES = 
 
 # Header files to ignore when scanning. Use base file name, no paths
-IGNORE_HFILES = chimara-glk-private.h \
-	abort.h charset.h event.h input.h stream.h window.h
+IGNORE_HFILES = chimara-glk-private.h chimara-marshallers.h \
+	abort.h charset.h event.h fileref.h graphics.h hyperlink.h init.h input.h \
+	magic.h mouse.h pager.h resource.h stream.h strio.h style.h timer.h window.h
 
 # Images to copy into HTML directory.
 HTML_IMAGES = \
@@ -81,12 +86,14 @@ content_files = version.xml \
 	glk-main-function.sgml \
 	glk-api-conventions.sgml \
 	glk-character-encoding.sgml \
+	glk-normalization.sgml \
 	glk-output.sgml \
 	glk-line-input.sgml \
 	glk-windows.sgml \
 	glk-window-arrangement.sgml \
 	glk-display-style.sgml \
 	glk-other-events.sgml \
+	glk-sound-resources.sgml \
 	glk-porting.sgml \
 	dispatch.sgml \
 	blorb.sgml \
@@ -97,6 +104,7 @@ content_files = version.xml \
 expand_content_files = \
 	glk-main-function.sgml \
 	glk-api-conventions.sgml \
+	glk-normalization.sgml \
 	glk-output.sgml \
 	glk-line-input.sgml \
 	glk-window-arrangement.sgml \
@@ -107,7 +115,7 @@ expand_content_files = \
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
 GTKDOC_CFLAGS = -I$(top_srcdir) $(CHIMARA_CFLAGS)
-GTKDOC_LIBS =  $(top_builddir)/libchimara/libchimara.la
+GTKDOC_LIBS =  $(top_builddir)/libchimara/libchimara.la $(CHIMARA_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
@@ -131,5 +139,7 @@ DISTCLEANFILES = version.xml $(DOC_MODULE)-overrides.txt
 dist_noinst_SCRIPTS = build-selector-table.pl
 
 selectors.xml: $(srcdir)/../../libchimara/gi_dispa.c
-	$(PERL) build-selector-table.pl $< > $@
+	$(AM_V_GEN)$(PERL) build-selector-table.pl $< > $@
 
+
+-include $(top_srcdir)/git.mk