[cogl/rstrode/wip/prepare-for-mutter-merge: 11/12] configure: get rid of docs
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/rstrode/wip/prepare-for-mutter-merge: 11/12] configure: get rid of docs
- Date: Thu, 10 Mar 2016 21:49:38 +0000 (UTC)
commit 2c458cc6ea60f8cf9879b398f1be42059471feaa
Author: Ray Strode <rstrode redhat com>
Date: Tue Jan 12 17:01:20 2016 -0500
configure: get rid of docs
Makefile.am | 3 +-
configure.ac | 18 -
doc/CODING_STYLE | 50 -
doc/Makefile.am | 9 -
doc/RELEASING | 129 ---
doc/reference/Makefile.am | 5 -
doc/reference/cogl-2.0-experimental/Makefile.am | 132 ---
.../cogl-2.0-experimental/blend-strings.xml | 129 ---
.../cogl-2.0-experimental-docs.xml.in | 229 -----
.../cogl-2.0-experimental-sections.txt | 1058 --------------------
doc/reference/cogl-2.0-experimental/cogl_ortho.png | Bin 12650 -> 0 bytes
.../cogl-2.0-experimental/fill-rule-even-odd.png | Bin 3121 -> 0 bytes
.../cogl-2.0-experimental/fill-rule-non-zero.png | Bin 3143 -> 0 bytes
.../cogl-2.0-experimental/quad-indices-order.png | Bin 2620 -> 0 bytes
.../quad-indices-triangles.png | Bin 8018 -> 0 bytes
doc/reference/cogl-gst/Makefile.am | 106 --
doc/reference/cogl-gst/cogl-gst-docs.xml.in | 105 --
doc/reference/cogl-gst/cogl-gst-sections.txt | 33 -
doc/reference/cogl-gst/cogl-gst.types | 2 -
doc/reference/cogl/Makefile.am | 153 ---
doc/reference/cogl/blend-strings.xml | 129 ---
doc/reference/cogl/cogl-docs.xml.in | 212 ----
doc/reference/cogl/cogl-sections.txt | 715 -------------
doc/reference/cogl/cogl_ortho.png | Bin 12650 -> 0 bytes
doc/reference/cogl/fill-rule-even-odd.png | Bin 3121 -> 0 bytes
doc/reference/cogl/fill-rule-non-zero.png | Bin 3143 -> 0 bytes
doc/reference/cogl/quad-indices-order.png | Bin 2620 -> 0 bytes
doc/reference/cogl/quad-indices-triangles.png | Bin 8018 -> 0 bytes
28 files changed, 1 insertions(+), 3216 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 79628e4..dfe2234 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ if BUILD_COGL_GST
SUBDIRS += cogl-gst
endif
-SUBDIRS += doc po build
+SUBDIRS += po build
ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
@@ -33,7 +33,6 @@ CLEANFILES=
DISTCLEANFILES=
DISTCHECK_CONFIGURE_FLAGS = \
- --enable-gtk-doc \
--enable-maintainer-flags \
--enable-profile \
--enable-gles2 \
diff --git a/configure.ac b/configure.ac
index 44fced5..83460ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,6 @@ m4_define([pangocairo_req_version], [1.20])
m4_define([gi_req_version], [0.9.5])
m4_define([gdk_pixbuf_req_version], [2.0])
m4_define([uprof_req_version], [0.3])
-m4_define([gtk_doc_req_version], [1.13])
m4_define([xfixes_req_version], [3])
m4_define([xcomposite_req_version], [0.4])
m4_define([xrandr_req_version], [1.2])
@@ -106,7 +105,6 @@ AC_SUBST([CAIRO_REQ_VERSION], [cairo_req_version])
AC_SUBST([PANGOCAIRO_REQ_VERSION], [pangocairo_req_version])
AC_SUBST([XCOMPOSITE_REQ_VERSION], [xcomposite_req_version])
AC_SUBST([XFIXES_REQ_VERSION], [xfixes_req_version])
-AC_SUBST([GTK_DOC_REQ_VERSION], [gtk_doc_req_version])
AC_SUBST([GI_REQ_VERSION], [gi_req_version])
AC_SUBST([UPROF_REQ_VERSION], [uprof_req_version])
AC_SUBST([WAYLAND_REQ_VERSION], [wayland_req_version])
@@ -923,13 +921,6 @@ AM_CONDITIONAL(SUPPORT_XLIB, [test "x$SUPPORT_XLIB" = "xyes"])
dnl ================================================================
dnl Documentation stuff.
dnl ================================================================
-# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
-# it on it's own line.
-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"])
-
GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
GDKPIXBUF_PREFIX="`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`"
AC_SUBST(GLIB_PREFIX)
@@ -1149,14 +1140,6 @@ cogl-gst/cogl-gst-2.0-experimental.pc
cogl-gles2/Makefile
cogl-gles2/cogl-gles2-1.0.pc
cogl-gles2/cogl-gles2-2.0-experimental.pc
-doc/Makefile
-doc/reference/Makefile
-doc/reference/cogl/Makefile
-doc/reference/cogl/cogl-docs.xml
-doc/reference/cogl-2.0-experimental/Makefile
-doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml
-doc/reference/cogl-gst/Makefile
-doc/reference/cogl-gst/cogl-gst-docs.xml
po/Makefile.in
)
@@ -1207,7 +1190,6 @@ echo " Linker flags: ${LDFLAGS} ${COGL_EXTRA_LDFLAGS}"
# Miscellaneous
echo ""
echo " • Extra:"
-echo " Build API reference: ${enable_gtk_doc}"
echo " Build introspection data: ${enable_introspection}"
echo " Enable internationalization: ${USE_NLS}"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]