[cairo-commit] 2 commits - build/configure.ac.features build/Makefile.am.gtk-doc doc/public test/Makefile.am

[Chris Wilson]

 build/Makefile.am.gtk-doc   |   11 ++++++-----
 build/configure.ac.features |    2 +-
 doc/public/Makefile.am      |    5 +++--
 test/Makefile.am            |    1 +
 4 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 3f474555dd00b8585ae3db848cf46984d77bd16e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 12 11:19:50 2009 +0100

    [test] Add jp2.jp2 to EXTRA_DIST
    
    Required by test/mime-data and so triggering failures during distcheck as
    it was not packaged.

diff --git a/test/Makefile.am b/test/Makefile.am
index 212bfd3..f6cb2f2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1005,6 +1005,7 @@ EXTRA_DIST +=		\
 make-html.pl		\
 jpeg.jpg		\
 png.png			\
+jp2.jp2			\
 romedalen.jpg		\
 romedalen.png		\
 scarab.jpg		\
commit 7f114b781f5c530d57530e5f76402e41cdabac6b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 12 11:15:16 2009 +0100

    [doc] Workaround read-only tree during make distcheck
    
    This looks to be an ugly necessity to work-around the nasty issue that
    we currently gtkdoc expect to be run inside the source tree. I'm sure
    Behdad will be able to resolve this much more elegantly than this quick
    and fragile attempt.

diff --git a/build/Makefile.am.gtk-doc b/build/Makefile.am.gtk-doc
index b52fdfa..7161702 100644
--- a/build/Makefile.am.gtk-doc
+++ b/build/Makefile.am.gtk-doc
@@ -62,11 +62,10 @@ docs: html-build.stamp
 
 #### scan ####
 
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) $(EXTRA_HFILES)
 	@echo 'gtk-doc: Scanning header files'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) --output-dir=$(srcdir)
 	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
 	else \
@@ -97,11 +96,13 @@ tmpl/*.sgml:
 
 #### xml ####
 
+# gtkdoc-mkdb is broken and requires a --root-dir=$(srcdir) option
+# The _srcdir diversion is fragile but works for make check; make distcheck
 sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
 	@echo 'gtk-doc: Building XML'
 	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+	_srcdir="`pwd`/$(DOC_SOURCE_DIR)"; \
+	cd $(srcdir) && gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$$_srcdir --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
 	touch sgml-build.stamp
 
 sgml.stamp: sgml-build.stamp
diff --git a/build/configure.ac.features b/build/configure.ac.features
index 8ccee7b..eef98c2 100644
--- a/build/configure.ac.features
+++ b/build/configure.ac.features
@@ -260,7 +260,7 @@ CAIRO_CONFIG_COMMANDS([src/cairo-features.h],
 	CAIRO_NO_FEATURES='$CAIRO_NO_FEATURES'
 ])dnl
 dnl Generate src/cairo-supported-features.h
-CAIRO_CONFIG_COMMANDS([$srcdir/src/cairo-supported-features.h],
+CAIRO_CONFIG_COMMANDS([src/cairo-supported-features.h],
 [dnl
 	echo '/* Generated by configure.  Do not edit. */'
 	echo '#ifndef CAIRO_SUPPORTED_FEATURES_H'
diff --git a/doc/public/Makefile.am b/doc/public/Makefile.am
index 65ed2fb..cc95ce2 100644
--- a/doc/public/Makefile.am
+++ b/doc/public/Makefile.am
@@ -10,12 +10,13 @@ DOC_MAIN_SGML_FILE=cairo-docs.xml
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--deprecated-guards="CAIRO_DISABLE_DEPRECATED" --ignore-decorators="cairo_public|cairo_private"
 
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../src
+# The directory containing the source code.
+DOC_SOURCE_DIR=$(top_srcdir)/src
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/src/cairo*.h
 CFILE_GLOB=$(top_srcdir)/src/cairo*.c
+EXTRA_HFILES=$(top_builddir)/src/cairo-supported-features.h
 
 # Headers to ignore
 IGNORE_HFILES= \