Make docs not build by "make all", but by "make doc", "make dist", and "make

install".

5 files changed, 21 insertions, 6 deletions

diff --git a/Makefile.am b/Makefile.am
index cae2e7ab..62f01c20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
 DIST_SUBDIRS = pixman src test doc
 SUBDIRS = pixman src doc
 
+.PHONY: doc
+doc:
+	-$(MAKE) -C doc doc
+
 # libpng is required for our test programs
 if CAIRO_HAS_PNG_FUNCTIONS
 SUBDIRS += test
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 411ad5c9..74d82988 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,4 @@
 SUBDIRS=public
-
+.PHONY: doc
+doc:
+	-$(MAKE) -C public doc
diff --git a/doc/public/tmpl/cairo-types.sgml b/doc/public/tmpl/cairo-types.sgml
index 9e6f6b59..c0c14faf 100644
--- a/doc/public/tmpl/cairo-types.sgml
+++ b/doc/public/tmpl/cairo-types.sgml
@@ -17,13 +17,11 @@ Generic data types used in the cairo API
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### FUNCTION cairo_bool_t ##### -->
+<!-- ##### TYPEDEF cairo_bool_t ##### -->
 <para>
 
 </para>
 
-@Returns: 
-
 
 <!-- ##### STRUCT cairo_user_data_key_t ##### -->
 <para>
diff --git a/doc/public/tmpl/cairo-version.sgml b/doc/public/tmpl/cairo-version.sgml
index 42eb58eb..3c3404ed 100644
--- a/doc/public/tmpl/cairo-version.sgml
+++ b/doc/public/tmpl/cairo-version.sgml
@@ -124,6 +124,13 @@ if (cairo_version() >= %CAIRO_VERSION_ENCODE(1, 0, 0))
 
 
 
+<!-- ##### MACRO CAIRO_VERSION_STRING ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO CAIRO_VERSION_ENCODE ##### -->
 <para>
 
diff --git a/gtk-doc.make b/gtk-doc.make
index d50629a1..a1fbac68 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -41,7 +41,7 @@ SCANOBJ_FILES = 		 \
 CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
 
 if ENABLE_GTK_DOC
-all-local: html-build.stamp
+doc: html-build.stamp
 
 #### scan ####
 
@@ -88,6 +88,8 @@ sgml.stamp: sgml-build.stamp
 
 #### html ####
 
+dist-hook install-data-local: html-build.stamp
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	@echo 'gtk-doc: Building HTML'
 	@-chmod -R u+w $(srcdir)
@@ -99,7 +101,9 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
 	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	touch html-build.stamp
 else
-all-local:
+doc:
+	@echo "*** gtk-doc must be installed and enabled in order to make doc"
+	@false
 endif
 
 ##############