sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

build: Enable building the documentation again

Browse source 
At least the 1.6.0 documentation. The 2.0 one has been missed by the
filter-branch and will be re-added later.
This commit is contained in:
Damien Lespiau 2011-05-06 17:59:00 +01:00
parent 3919f3e97e
commit 8d4a6f4d4c
6 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1,4 +1,4 @@
SUBDIRS = cogl examples po SUBDIRS = cogl examples doc po
if BUILD_COGL_PANGO if BUILD_COGL_PANGO
SUBDIRS += cogl-pango SUBDIRS += cogl-pango

7
configure.ac
View file

@ -647,7 +647,7 @@ dnl ================================================================
dnl Documentation stuff. dnl Documentation stuff.
dnl ================================================================ dnl ================================================================
GTK_DOC_CHECK([gtk_doc_req_version], [--flavour no-tmpl]) GTK_DOC_CHECK([gtk_doc_req_version], [--flavour no-tmpl])
AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes"])
dnl ================================================================ dnl ================================================================
dnl Check for dependency packages. dnl Check for dependency packages.
@ -737,6 +737,10 @@ cogl/cogl-defines.h
cogl-pango/Makefile cogl-pango/Makefile
cogl-pango/cogl-pango-1.0.pc cogl-pango/cogl-pango-1.0.pc
cogl-pango/cogl-pango-$COGL_MAJOR_VERSION.0.pc:cogl-pango/cogl-pango.pc.in cogl-pango/cogl-pango-$COGL_MAJOR_VERSION.0.pc:cogl-pango/cogl-pango.pc.in
doc/Makefile
doc/reference/Makefile
doc/reference/cogl/Makefile
doc/reference/cogl/cogl-docs.xml
examples/Makefile examples/Makefile
po/Makefile.in po/Makefile.in
) )
@ -773,6 +777,7 @@ echo " Linker flags: ${LDFLAGS} ${COGL_EXTRA_LDFLAGS}"
# Miscellaneous # Miscellaneous
echo "" echo ""
echo " • Extra:" echo " • Extra:"
echo " Build API reference: ${enable_gtk_doc}"
echo " Build introspection data: ${enable_introspection}" echo " Build introspection data: ${enable_introspection}"
echo "" echo ""

7
doc/Makefile.am Normal file
View file

@ -0,0 +1,7 @@
SUBDIRS =
if BUILD_GTK_DOC
SUBDIRS += reference
endif
DIST_SUBDIRS = reference

1
doc/reference/Makefile.am Normal file
View file

@ -0,0 +1 @@
SUBDIRS = cogl

12
doc/reference/cogl/Makefile.am
View file

@ -18,7 +18,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
# gtk-doc will search all .c & .h files beneath here for inline comments # gtk-doc will search all .c & .h files beneath here for inline comments
# documenting the functions and macros. # documenting the functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk # e.g. DOC_SOURCE_DIR=../../../gtk
DOC_SOURCE_DIR=../../../clutter/cogl/cogl DOC_SOURCE_DIR=../../../cogl
# Extra options to pass to gtkdoc-scangobj. Not normally needed. # Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=--type-init-func="g_type_init()" SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
@ -45,9 +45,9 @@ FIXXREF_OPTIONS=\
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
HFILE_GLOB=\ HFILE_GLOB=\
$(top_srcdir)/clutter/cogl/cogl/*.h \ $(top_srcdir)/cogl/*.h \
$(top_builddir)/clutter/cogl/cogl/*.h $(top_builddir)/cogl/*.h
CFILE_GLOB=$(top_srcdir)/clutter/cogl/cogl/*.c CFILE_GLOB=$(top_srcdir)/cogl/*.c
# Header files to ignore when scanning. # Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@ -134,8 +134,8 @@ expand_content_files = \
# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/clutter -I$(top_srcdir)/clutter/cogl -I$(top_builddir)/clutter/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $(CLUTTER_CFLAGS) INCLUDES=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $(COGL_DEP_CFLAGS)
GTKDOC_LIBS=$(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la $(CLUTTER_LIBS) GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_LIBS)
# This includes the standard gtk-doc make rules, copied by gtkdocize. # This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make include $(top_srcdir)/gtk-doc.make

2
doc/reference/cogl/cogl-docs.xml.in
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY version "@VERSION@"> <!ENTITY version "@COGL_1_VERSION@">
]> ]>
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude"> <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">