brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Allow to compile a git checkout without gtk-doc

Browse Source 
Gtk-doc can be hard to install on Windows. This patch enables people wanting to
hack on Cogl itself from a Windows system to do so without the hassle to get
gtk-doc installed first.
This commit is contained in:
Damien Lespiau 2011-05-12 11:07:30 +01:00
parent 1127ab61a1
commit dc5d3785f6
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
autogen.sh
View File

@ -30,11 +30,9 @@ ECT."
fi fi
(gtkdocize --version) < /dev/null > /dev/null 2>&1 || { (gtkdocize --version) < /dev/null > /dev/null 2>&1 || {
echo echo "You don't have gtk-doc installed to compile $PROJECT, and thus"
echo "You must have gtk-doc installed to compile $PROJECT." echo "won't be able to generate the $PROJECT documentation."
echo "Install the appropriate package for your distribution," NOGTKDOC=1
echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
exit 1
} }
# NOCONFIGURE is used by gnome-common # NOCONFIGURE is used by gnome-common
@ -63,7 +61,10 @@ fi
rm -rf autom4te.cache rm -rf autom4te.cache
if test -z "$NOGTKDOC"; then
gtkdocize || exit $? gtkdocize || exit $?
fi
autoreconf -vfi || exit $? autoreconf -vfi || exit $?
cd $ORIGDIR || exit $? cd $ORIGDIR || exit $?

3
configure.ac
View File

@ -697,7 +697,8 @@ AS_ALL_LINGUAS
dnl ================================================================ dnl ================================================================
dnl Documentation stuff. dnl Documentation stuff.
dnl ================================================================ dnl ================================================================
GTK_DOC_CHECK([gtk_doc_req_version], [--flavour no-tmpl]) m4_ifdef([GTK_DOC_CHECK],
[GTK_DOC_CHECK([gtk_doc_req_version], [--flavour no-tmpl])])
AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes"]) AM_CONDITIONAL([BUILD_GTK_DOC], [test "x$enable_gtk_doc" = "xyes"])
dnl ================================================================ dnl ================================================================

3
doc/reference/cogl-2.0/Makefile.am
View File

@ -141,7 +141,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $
GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_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 EXTRA_DIST =
-include $(top_srcdir)/gtk-doc.make
# Other files to distribute # Other files to distribute
# e.g. EXTRA_DIST += version.xml.in # e.g. EXTRA_DIST += version.xml.in

3
doc/reference/cogl/Makefile.am
View File

@ -138,7 +138,8 @@ INCLUDES=-I$(top_srcdir) -I$(top_builddir)/cogl -DCOGL_ENABLE_EXPERIMENTAL_API $
GTKDOC_LIBS=$(top_builddir)/cogl/libcogl.la $(COGL_DEP_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 EXTRA_DIST =
-include $(top_srcdir)/gtk-doc.make
# Other files to distribute # Other files to distribute
# e.g. EXTRA_DIST += version.xml.in # e.g. EXTRA_DIST += version.xml.in