Re-synch with latest from gtk-doc CVS tree.

Add --only-section-tmpl option so that changes to inline documentation does not lead to churn in the .sgml template files.
Commit new templates now that gtk-doc has ripped all the inline portions out.
New template files added for new sections.
Update to match current API.
Make parameter names match those in the .c file and its documentation.
This commit is contained in:
Carl Worth 2005-05-24 16:08:39 +00:00
parent d41465d89a
commit 17a5c3a3da
22 changed files with 178 additions and 1923 deletions

View file

@ -1,3 +1,36 @@
2005-05-24 Carl Worth <cworth@cworth.org>
* gtk-doc.make: Re-synch with latest from gtk-doc CVS tree.
* doc/public/Makefile.am (MKTMPL_OPTIONS): Add --only-section-tmpl
option so that changes to inline documentation does not lead to
churn in the .sgml template files.
* doc/public/tmpl/cairo-font.sgml:
* doc/public/tmpl/cairo-ft.sgml:
* doc/public/tmpl/cairo-glitz.sgml:
* doc/public/tmpl/cairo-matrix.sgml:
* doc/public/tmpl/cairo-pattern.sgml:
* doc/public/tmpl/cairo-pdf.sgml:
* doc/public/tmpl/cairo-png.sgml:
* doc/public/tmpl/cairo-ps.sgml:
* doc/public/tmpl/cairo-quartz.sgml:
* doc/public/tmpl/cairo-surface.sgml:
* doc/public/tmpl/cairo-xcb.sgml:
* doc/public/tmpl/cairo-xlib.sgml:
* doc/public/tmpl/cairo.sgml: Commit new templates now that
gtk-doc has ripped all the inline portions out.
* doc/public/tmpl/cairo-win32.sgml:
* doc/public/tmpl/cairo-xcb-xrender.sgml:
* doc/public/tmpl/cairo-xlib-xrender.sgml: New template files
added for new sections.
* doc/public/cairo-sections.txt: Update to match current API.
* src/cairo-xcb.h: Make parameter names match those in the .c file
and its documentation.
2005-05-22 Carl Worth <cworth@cworth.org>
* src/cairo.c (cairo_create): Protect less-than and greater-than

View file

@ -3,6 +3,7 @@ Makefile
Makefile.in
cairo-decl-list.txt
cairo-decl.txt
cairo-docs.sgml
cairo-undocumented.txt
cairo-unused.txt
cairo.hierarchy
@ -13,3 +14,5 @@ cairo.signals
html
xml

View file

@ -38,6 +38,9 @@ GTKDOC_LIBS =
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS=--sgml-mode --output-format=xml
# Extra options to supply to gtkdoc-mktmpl
MKTMPL_OPTIONS=--only-section-tmpl
# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
content_files = \
language-bindings.xml

View file

@ -1,7 +1,6 @@
<SECTION>
<FILE>cairo-atsui</FILE>
<TITLE>ATSUI Fonts</TITLE>
cairo_atsui_font_create
</SECTION>
<SECTION>
@ -23,7 +22,8 @@ cairo_glitz_surface_create
<FILE>cairo-pdf</FILE>
<TITLE>PDF Backend</TITLE>
cairo_pdf_surface_create
cairo_pdf_surface_create_for_callback
cairo_pdf_surface_create_for_stream
cairo_pdf_surface_set_dpi
</SECTION>
<SECTION>
@ -39,6 +39,8 @@ cairo_surface_write_to_png_stream
<FILE>cairo-ps</FILE>
<TITLE>PS Backend</TITLE>
cairo_ps_surface_create
cairo_ps_surface_create_for_stream
cairo_ps_surface_set_dpi
</SECTION>
<SECTION>
@ -61,30 +63,38 @@ cairo_win32_scaled_font_get_metrics_factor
<FILE>cairo-xcb</FILE>
<TITLE>XCB Backend</TITLE>
cairo_xcb_surface_create
cairo_xcb_surface_create_for_bitmap
cairo_xcb_surface_set_size
</SECTION>
<SECTION>
<FILE>cairo-xcb-xrender</FILE>
<TITLE>XCB Backend</TITLE>
cairo_xcb_surface_create_with_xrender_format
</SECTION>
<SECTION>
<FILE>cairo-xlib</FILE>
<TITLE>XLib Backend</TITLE>
cairo_xlib_surface_create
cairo_xlib_surface_create_with_visual
cairo_xlib_surface_create_for_bitmap
cairo_xlib_surface_set_size
</SECTION>
<SECTION>
<FILE>cairo-xlib-xrender</FILE>
<TITLE>XLib/Xrender Backend</TITLE>
cairo_xlib_surface_create_with_xrender_format
</SECTION>
<SECTION>
<FILE>cairo-surface</FILE>
<TITLE>cairo_surface_t</TITLE>
cairo_surface_t
cairo_surface_create_for_image
cairo_surface_create_similar
cairo_surface_reference
cairo_surface_destroy
cairo_surface_finish
cairo_surface_set_repeat
cairo_surface_set_matrix
cairo_surface_get_matrix
cairo_surface_set_filter
cairo_surface_get_filter
cairo_surface_set_user_data
cairo_surface_get_user_data
cairo_surface_set_device_offset
@ -108,8 +118,6 @@ cairo_pattern_set_extend
cairo_pattern_get_extend
cairo_pattern_set_filter
cairo_pattern_get_filter
<SUBSECTION Private>
cairo_pattern_add_color_stop
</SECTION>
<SECTION>
@ -128,13 +136,6 @@ cairo_matrix_invert
cairo_matrix_multiply
cairo_matrix_transform_distance
cairo_matrix_transform_point
<SUBSECTION Private>
cairo_matrix_create
cairo_matrix_destroy
cairo_matrix_copy
cairo_matrix_set_identity
cairo_matrix_set_affine
cairo_matrix_get_affine
</SECTION>
<SECTION>
@ -164,7 +165,6 @@ cairo_reference
cairo_destroy
cairo_save
cairo_restore
cairo_copy
cairo_format_t
cairo_operator_t
cairo_set_operator
@ -172,7 +172,6 @@ cairo_set_source_rgb
cairo_set_source_rgba
cairo_set_source
cairo_set_source_surface
cairo_set_alpha
cairo_set_tolerance
cairo_fill_rule_t
cairo_set_fill_rule
@ -188,7 +187,6 @@ cairo_scale
cairo_rotate
cairo_transform
cairo_set_matrix
cairo_default_matrix
cairo_identity_matrix
cairo_user_to_device
cairo_user_to_device_distance
@ -239,7 +237,6 @@ cairo_text_extents
cairo_glyph_extents
cairo_text_path
cairo_glyph_path
cairo_show_surface
cairo_get_operator
cairo_get_source
cairo_get_tolerance
@ -251,8 +248,6 @@ cairo_get_line_join
cairo_get_miter_limit
cairo_get_matrix
cairo_get_target
cairo_get_path
cairo_get_path_flat
cairo_copy_path
cairo_copy_path_flat
cairo_append_path
@ -273,7 +268,8 @@ cairo_write_func_t
<SUBSECTION Private>
CAIRO_BEGIN_DECLS
CAIRO_END_DECLS
cairo_concat_matrix
cairo_current_font_extents
cairo_get_font_extents
cairo_current_operator
cairo_current_tolerance
cairo_current_point
@ -284,20 +280,54 @@ cairo_current_line_join
cairo_current_miter_limit
cairo_current_matrix
cairo_current_target_surface
cairo_current_path
cairo_current_path_flat
cairo_current_font_extents
cairo_init_clip
cairo_inverse_transform_point
cairo_inverse_transform_distance
cairo_scale_font
cairo_select_font
cairo_set_pattern
cairo_set_rgb_color
cairo_transform_font
cairo_get_font_extents
cairo_get_status
cairo_get_status_string
cairo_concat_matrix
cairo_scale_font
cairo_select_font
cairo_transform_font
cairo_transform_point
cairo_transform_distance
cairo_inverse_transform_point
cairo_inverse_transform_distance
cairo_init_clip
cairo_surface_create_for_image
cairo_default_matrix
cairo_matrix_set_affine
cairo_matrix_set_identity
cairo_pattern_add_color_stop
cairo_set_rgb_color
cairo_set_pattern
cairo_xlib_surface_create_for_pixmap_with_visual
cairo_xlib_surface_create_for_window_with_visual
cairo_xcb_surface_create_for_pixmap_with_visual
cairo_xcb_surface_create_for_window_with_visual
cairo_current_path
cairo_current_path_flat
cairo_get_path
cairo_get_path_flat
cairo_set_alpha
cairo_show_surface
cairo_copy
cairo_surface_set_repeat
cairo_surface_set_matrix
cairo_surface_get_matrix
cairo_surface_set_filter
cairo_surface_get_filter
cairo_matrix_create
cairo_matrix_destroy
cairo_matrix_copy
cairo_matrix_set_identity
cairo_matrix_set_affine
cairo_matrix_get_affine
cairo_set_target_surface
cairo_set_target_glitz
cairo_set_target_image
cairo_set_target_pdf
cairo_set_target_png
cairo_set_target_ps
cairo_set_target_quartz
cairo_set_target_win32
cairo_set_target_xcb
cairo_set_target_drawable
</SECTION>

View file

@ -17,132 +17,3 @@ Font Handling
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### TYPEDEF cairo_font_face_t ##### -->
<para>
</para>
<!-- ##### TYPEDEF cairo_scaled_font_t ##### -->
<para>
</para>
<!-- ##### FUNCTION cairo_font_face_reference ##### -->
<para>
</para>
@font_face:
<!-- ##### FUNCTION cairo_font_face_destroy ##### -->
<para>
</para>
@font_face:
<!-- ##### FUNCTION cairo_font_face_get_user_data ##### -->
<para>
</para>
@font_face:
@key:
@Returns:
<!-- ##### FUNCTION cairo_font_face_set_user_data ##### -->
<para>
</para>
@font_face:
@key:
@user_data:
@destroy:
@Returns:
<!-- ##### FUNCTION cairo_scaled_font_create ##### -->
<para>
</para>
@font_face:
@font_matrix:
@ctm:
@Returns:
<!-- ##### FUNCTION cairo_scaled_font_reference ##### -->
<para>
</para>
@scaled_font:
<!-- # Unused Parameters # -->
@font:
<!-- ##### FUNCTION cairo_scaled_font_destroy ##### -->
<para>
</para>
@scaled_font:
<!-- # Unused Parameters # -->
@font:
<!-- ##### STRUCT cairo_font_extents_t ##### -->
<para>
</para>
@ascent:
@descent:
@height:
@max_x_advance:
@max_y_advance:
<!-- ##### FUNCTION cairo_scaled_font_extents ##### -->
<para>
</para>
@scaled_font:
@extents:
@Returns:
<!-- # Unused Parameters # -->
@font:
<!-- ##### STRUCT cairo_text_extents_t ##### -->
<para>
</para>
@x_bearing:
@y_bearing:
@width:
@height:
@x_advance:
@y_advance:
<!-- ##### FUNCTION cairo_scaled_font_glyph_extents ##### -->
<para>
</para>
@scaled_font:
@glyphs:
@num_glyphs:
@extents:
<!-- # Unused Parameters # -->
@font:

View file

@ -17,39 +17,3 @@ FreeType Fonts
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_ft_font_face_create_for_pattern ##### -->
<para>
</para>
@pattern:
@Returns:
<!-- ##### FUNCTION cairo_ft_font_face_create_for_ft_face ##### -->
<para>
</para>
@face:
@load_flags:
@Returns:
<!-- ##### FUNCTION cairo_ft_scaled_font_lock_face ##### -->
<para>
</para>
@scaled_font:
@Returns:
<!-- ##### FUNCTION cairo_ft_scaled_font_unlock_face ##### -->
<para>
</para>
@scaled_font:

View file

@ -17,12 +17,3 @@ Glitz backend
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_glitz_surface_create ##### -->
<para>
</para>
@surface:
@Returns:

View file

@ -41,160 +41,3 @@ cairo_matrix_t
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### STRUCT cairo_matrix_t ##### -->
<para>
</para>
@xx:
@yx:
@xy:
@yy:
@x0:
@y0:
<!-- ##### FUNCTION cairo_matrix_init ##### -->
<para>
</para>
@matrix:
@xx:
@yx:
@xy:
@yy:
@x0:
@y0:
<!-- # Unused Parameters # -->
@Param7:
@a:
@b:
@c:
@d:
@tx:
@ty:
<!-- ##### FUNCTION cairo_matrix_init_identity ##### -->
<para>
</para>
@matrix:
<!-- ##### FUNCTION cairo_matrix_init_translate ##### -->
<para>
</para>
@matrix:
@tx:
@ty:
<!-- ##### FUNCTION cairo_matrix_init_scale ##### -->
<para>
</para>
@matrix:
@sx:
@sy:
<!-- ##### FUNCTION cairo_matrix_init_rotate ##### -->
<para>
</para>
@matrix:
@radians:
<!-- ##### FUNCTION cairo_matrix_translate ##### -->
<para>
</para>
@matrix:
@tx:
@ty:
<!-- # Unused Parameters # -->
@Returns:
<!-- ##### FUNCTION cairo_matrix_scale ##### -->
<para>
</para>
@matrix:
@sx:
@sy:
<!-- # Unused Parameters # -->
@Returns:
<!-- ##### FUNCTION cairo_matrix_rotate ##### -->
<para>
</para>
@matrix:
@radians:
<!-- # Unused Parameters # -->
@Returns:
<!-- ##### FUNCTION cairo_matrix_invert ##### -->
<para>
</para>
@matrix:
@Returns:
<!-- ##### FUNCTION cairo_matrix_multiply ##### -->
<para>
</para>
@result:
@a:
@b:
<!-- # Unused Parameters # -->
@Returns:
<!-- ##### FUNCTION cairo_matrix_transform_distance ##### -->
<para>
</para>
@matrix:
@dx:
@dy:
<!-- # Unused Parameters # -->
@Returns:
<!-- ##### FUNCTION cairo_matrix_transform_point ##### -->
<para>
</para>
@matrix:
@x:
@y:
<!-- # Unused Parameters # -->
@Returns:
<!--
Local variables:
mode: sgml
sgml-parent-document: ("../cairo-docs.xml" "book" "refsect2" "")
End:
-->

View file

@ -17,154 +17,3 @@ cairo_pattern_t
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### TYPEDEF cairo_pattern_t ##### -->
<para>
</para>
<!-- ##### FUNCTION cairo_pattern_create_for_surface ##### -->
<para>
</para>
@surface:
@Returns:
<!-- ##### FUNCTION cairo_pattern_create_linear ##### -->
<para>
</para>
@x0:
@y0:
@x1:
@y1:
@Returns:
<!-- ##### FUNCTION cairo_pattern_create_radial ##### -->
<para>
</para>
@cx0:
@cy0:
@radius0:
@cx1:
@cy1:
@radius1:
@Returns:
<!-- ##### FUNCTION cairo_pattern_reference ##### -->
<para>
</para>
@pattern:
<!-- ##### FUNCTION cairo_pattern_destroy ##### -->
<para>
</para>
@pattern:
<!-- ##### FUNCTION cairo_pattern_add_color_stop_rgb ##### -->
<para>
</para>
@pattern:
@offset:
@red:
@green:
@blue:
@Returns:
<!-- ##### FUNCTION cairo_pattern_add_color_stop_rgba ##### -->
<para>
</para>
@pattern:
@offset:
@red:
@green:
@blue:
@alpha:
@Returns:
<!-- ##### FUNCTION cairo_pattern_set_matrix ##### -->
<para>
</para>
@pattern:
@matrix:
@Returns:
<!-- ##### FUNCTION cairo_pattern_get_matrix ##### -->
<para>
</para>
@pattern:
@matrix:
@Returns:
<!-- ##### ENUM cairo_extend_t ##### -->
<para>
</para>
@CAIRO_EXTEND_NONE:
@CAIRO_EXTEND_REPEAT:
@CAIRO_EXTEND_REFLECT:
<!-- ##### FUNCTION cairo_pattern_set_extend ##### -->
<para>
</para>
@pattern:
@extend:
@Returns:
<!-- ##### FUNCTION cairo_pattern_get_extend ##### -->
<para>
</para>
@pattern:
@Returns:
<!-- ##### FUNCTION cairo_pattern_set_filter ##### -->
<para>
</para>
@pattern:
@filter:
@Returns:
<!-- ##### FUNCTION cairo_pattern_get_filter ##### -->
<para>
</para>
@pattern:
@Returns:

View file

@ -17,24 +17,3 @@ PDF Backend
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_pdf_surface_create ##### -->
<para>
</para>
@filename:
@width_in_points:
@height_in_points:
@Returns:
<!-- # Unused Parameters # -->
@fp:
@width_inches:
@height_inches:
@x_pixels_per_inch:
@y_pixels_per_inch:
@write_func:
@destroy_closure_func:
@closure:
@file:

View file

@ -17,43 +17,3 @@ PNG Backend
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_image_surface_create_from_png ##### -->
<para>
</para>
@filename:
@Returns:
<!-- ##### FUNCTION cairo_image_surface_create_from_png_stream ##### -->
<para>
</para>
@read_func:
@closure:
@Returns:
<!-- ##### FUNCTION cairo_surface_write_to_png ##### -->
<para>
</para>
@surface:
@filename:
@Returns:
<!-- ##### FUNCTION cairo_surface_write_to_png_stream ##### -->
<para>
</para>
@surface:
@write_func:
@closure:
@Returns:

View file

@ -17,20 +17,3 @@ PS Backend
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_ps_surface_create ##### -->
<para>
</para>
@filename:
@width_in_points:
@height_in_points:
@Returns:
<!-- # Unused Parameters # -->
@file:
@width_inches:
@height_inches:
@x_pixels_per_inch:
@y_pixels_per_inch:

View file

@ -17,14 +17,3 @@ Quartz Backend
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_quartz_surface_create ##### -->
<para>
</para>
@context:
@width:
@height:
@Returns:

View file

@ -17,148 +17,3 @@ cairo_surface_t
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### TYPEDEF cairo_surface_t ##### -->
<para>
</para>
<!-- ##### MACRO cairo_surface_create_for_image ##### -->
<para>
</para>
@Returns:
<!-- # Unused Parameters # -->
@data:
@format:
@width:
@height:
@stride:
<!-- ##### FUNCTION cairo_surface_create_similar ##### -->
<para>
</para>
@other:
@format:
@width:
@height:
@Returns:
<!-- ##### FUNCTION cairo_surface_reference ##### -->
<para>
</para>
@surface:
<!-- ##### FUNCTION cairo_surface_destroy ##### -->
<para>
</para>
@surface:
<!-- ##### FUNCTION cairo_surface_finish ##### -->
<para>
</para>
@surface:
@Returns:
<!-- ##### MACRO cairo_surface_set_repeat ##### -->
<para>
</para>
@Returns:
<!-- # Unused Parameters # -->
@surface:
@repeat:
<!-- ##### MACRO cairo_surface_set_matrix ##### -->
<para>
</para>
@Returns:
<!-- # Unused Parameters # -->
@surface:
@matrix:
<!-- ##### MACRO cairo_surface_get_matrix ##### -->
<para>
</para>
@Returns:
<!-- # Unused Parameters # -->
@surface:
@matrix:
<!-- ##### MACRO cairo_surface_set_filter ##### -->
<para>
</para>
@Returns:
<!-- # Unused Parameters # -->
@surface:
@filter:
<!-- ##### MACRO cairo_surface_get_filter ##### -->
<para>
</para>
@Returns:
<!-- # Unused Parameters # -->
@surface:
<!-- ##### FUNCTION cairo_surface_set_user_data ##### -->
<para>
</para>
@surface:
@key:
@user_data:
@destroy:
@Returns:
<!-- # Unused Parameters # -->
@data:
<!-- ##### FUNCTION cairo_surface_get_user_data ##### -->
<para>
</para>
@surface:
@key:
@Returns:
<!-- ##### FUNCTION cairo_surface_set_device_offset ##### -->
<para>
</para>
@surface:
@x_offset:
@y_offset:

View file

@ -0,0 +1,21 @@
<!-- ##### SECTION Title ##### -->
Microsoft Windows Backend
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### SECTION Stability_Level ##### -->

View file

@ -0,0 +1,21 @@
<!-- ##### SECTION Title ##### -->
XCB Backend
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### SECTION Stability_Level ##### -->

View file

@ -17,20 +17,3 @@ XCB Backend
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_xcb_surface_create ##### -->
<para>
</para>
@c:
@pixmap:
@visual:
@width:
@height:
@Returns:
<!-- # Unused Parameters # -->
@dpy:
@drawable:
@format:

View file

@ -0,0 +1,21 @@
<!-- ##### SECTION Title ##### -->
XLib/Xrender Backend
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### SECTION Stability_Level ##### -->

View file

@ -17,29 +17,3 @@ XLib Backend
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_xlib_surface_create ##### -->
<para>
</para>
@dpy:
@drawable:
@visual:
@width:
@height:
@Returns:
<!-- # Unused Parameters # -->
@format:
@colormap:
<!-- ##### FUNCTION cairo_xlib_surface_set_size ##### -->
<para>
</para>
@surface:
@width:
@height:

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,3 @@
#
# *** NOTE *** this file is checked into CVS for convenience only.
# DO NOT EDIT. Rather get changes into upstream gtk-doc and then
# update this version from the gtk-doc version.
#
# -*- mode: makefile -*-
####################################
@ -31,7 +25,6 @@ EXTRA_DIST = \
$(content_files) \
$(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt \
$(DOC_MODULE)-overrides.txt
@ -55,7 +48,7 @@ all-local: html-build.stamp
scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@echo '*** Scanning header files ***'
@-chmod -R u+w $(srcdir)
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
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 \
cd $(srcdir) ; \
@ -75,7 +68,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
@echo '*** Rebuilding template files ***'
@-chmod -R u+w $(srcdir)
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@ -83,11 +76,11 @@ tmpl.stamp: tmpl-build.stamp
#### xml ####
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
@echo '*** Building XML ***'
@-chmod -R u+w $(srcdir)
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
touch sgml-build.stamp
sgml.stamp: sgml-build.stamp
@ -146,18 +139,15 @@ dist-check-gtkdoc:
@false
endif
# XXX: Before this was:
# dist-hook: dist-check-gtkdoc dist-hook-local
# which seems reasonable, but for some reason the dist-check-gtkdoc
# was always failing on me, even though I do have gtk-doc installed
# and it is successfully building the documentation.
dist-hook: dist-hook-local
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/* $(distdir)/html
if test -f $(srcdir)/$(DOC_MODULE).types; then \
cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
fi
.PHONY : dist-hook-local

View file

@ -47,7 +47,7 @@ CAIRO_BEGIN_DECLS
cairo_surface_t *
cairo_xcb_surface_create (XCBConnection *c,
XCBDRAWABLE pixmap,
XCBDRAWABLE drawable,
XCBVISUALTYPE *visual,
int width,
int height);