head	1.4;
access;
symbols
	RELEASE_1_0_2:1.4
	BRANCH_1_0:1.4.0.2
	RELEASE_1_0_0:1.4
	BRANCH_SCALED_GLYPH:1.3.0.2
	RELEASE_0_9_2:1.3
	RELEASE_0_9_0:1.3
	SNAPSHOT_0_6_0:1.3
	SNAPSHOT_0_5_2:1.3
	SNAPSHOT_0_5_1:1.3
	SNAPSHOT_0_5_0:1.2
	SNAPSHOT_0_4_0:1.2;
locks; strict;
comment	@# @;


1.4
date	2005.08.21.16.57.19;	author otaylor;	state Exp;
branches;
next	1.3;
commitid	5efd4308b2674567;

1.3
date	2005.05.24.23.08.39;	author cworth;	state Exp;
branches;
next	1.2;
commitid	528f4293b3f64567;

1.2
date	2005.03.09.03.30.19;	author cworth;	state Exp;
branches;
next	1.1;

1.1
date	2005.01.27.19.35.25;	author otaylor;	state Exp;
branches;
next	;


desc
@@


1.4
log
@2005-08-21  Owen Taylor  <otaylor@@redhat.com>

        * autogen.sh: When invoked as, say, ../autogen.sh, switch to
        the sourcedir to run the auto*. Based on corresponding code
        in GTK+'s autogen.sh. (#3402, Thomas Fitzsimmons)

        * gtk-doc.make: Update from gtk-doc CVS, bringing in some
        minor output changes. (Eliminate the *** from the messages
        that don't indicate errors.)

        * doc/public/Makefile.am (EXTRA_DIST): Use += for EXTRA_DIST,
        since gtk-doc.make already defines it.
@
text
@# -*- mode: makefile -*-

####################################
# Everything below here is generic #
####################################

if GTK_DOC_USE_LIBTOOL
GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
else
GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
endif

# We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to
# whether a source that is a target of one rule is then
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)

TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)

EXTRA_DIST = 				\
	$(content_files)		\
	$(HTML_IMAGES)			\
	$(DOC_MAIN_SGML_FILE)		\
	$(DOC_MODULE)-sections.txt	\
	$(DOC_MODULE)-overrides.txt

DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp

SCANOBJ_FILES = 		 \
	$(DOC_MODULE).args 	 \
	$(DOC_MODULE).hierarchy  \
	$(DOC_MODULE).interfaces \
	$(DOC_MODULE).prerequisites \
	$(DOC_MODULE).signals

CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)

if ENABLE_GTK_DOC
all-local: html-build.stamp

#### scan ####

scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
	@@echo 'gtk-doc: Scanning header files'
	@@-chmod -R u+w $(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 \
	    cd $(srcdir) ; \
	    for i in $(SCANOBJ_FILES) ; do \
               test -f $$i || touch $$i ; \
	    done \
	fi
	cd $(srcdir) && \
	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
	touch scan-build.stamp

$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
	@@true

#### templates ####

tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
	@@echo 'gtk-doc: Rebuilding template files'
	@@-chmod -R u+w $(srcdir)
	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
	touch tmpl-build.stamp

tmpl.stamp: tmpl-build.stamp
	@@true

#### xml ####

sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(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)
	touch sgml-build.stamp

sgml.stamp: sgml-build.stamp
	@@true

#### html ####

html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
	@@echo 'gtk-doc: Building HTML'
	@@-chmod -R u+w $(srcdir)
	rm -rf $(srcdir)/html 
	mkdir $(srcdir)/html
	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
	@@echo 'gtk-doc: Fixing cross-references' 
	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
	touch html-build.stamp
else
all-local:
endif

##############

clean-local:
	rm -f *~ *.bak
	rm -rf .libs

maintainer-clean-local: clean
	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt

install-data-local:
	installfiles=`echo $(srcdir)/html/*`; \
	if test "$$installfiles" = '$(srcdir)/html/*'; \
	then echo '-- Nothing to install' ; \
	else \
	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
	  for i in $$installfiles; do \
	    echo '-- Installing '$$i ; \
	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
	  done; \
	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
	fi

uninstall-local:
	rm -f $(DESTDIR)$(TARGET_DIR)/*

#
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtkdoc:
else
dist-check-gtkdoc:
	@@echo "*** gtk-doc must be installed and enabled in order to make dist"
	@@false
endif

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
@


1.3
log
@
        * 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.
@
text
@d49 1
a49 1
	@@echo '*** Scanning header files ***'
d69 1
a69 1
	@@echo '*** Rebuilding template files ***'
d80 1
a80 1
	@@echo '*** Building XML ***'
d83 1
a83 1
	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
d92 1
a92 1
	@@echo '*** Building HTML ***'
d98 1
a98 1
	@@echo '-- Fixing Crossreferences' 
@


1.2
log
@
        * gtk-doc.make (dist-check-gtkdoc): Commit workaround to prevent
        make distcheck from making bogus complaints that gtk-doc is not
        enabled.
@
text
@a0 6
#
# *** 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.
#

a27 1
	$(DOC_MODULE).types		\
d51 1
a51 1
	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
d71 1
a71 1
	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
d79 1
a79 1
sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
d83 1
a83 1
	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS)
d142 1
a142 7
# 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
d149 3
@


1.1
log
@2005-01-27  Owen Taylor  <otaylor@@redhat.com>

        * configure.in Makefile.am docs/Makefile.am docs/public/*:
        Add framework for doing docs via gtk-doc.

        * src/cairo.[ch] src/cairo-matrix.c: Add some inline docs
        for arcs and matrices.

        * gtk-doc.m4 acinclude.m4: Check in files from gtk-doc
        to make the dependency on gtk-doc optional.

        * autogen.sh (LANG): Add --enable-gtk-doc to the default
        args.
@
text
@d149 7
a155 1
dist-hook: dist-check-gtkdoc dist-hook-local
@