[gnome-common] doc-build: Remove doc-build infrastructure
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-common] doc-build: Remove doc-build infrastructure
- Date: Tue, 23 Sep 2014 07:13:18 +0000 (UTC)
commit a912a74ba7999fe3ed49b07bab86685a5d117f82
Author: Philip Withnall <philip withnall collabora co uk>
Date: Fri May 2 16:09:43 2014 +0200
doc-build: Remove doc-build infrastructure
This pertained to the old GNOME documentation infrastructure, used
before Mallard existed. This isn’t used by any modules we care about
any more. Most modules which set USE_COMMON_DOC_BUILD do so erroneously.
https://bugzilla.gnome.org/show_bug.cgi?id=729931
Makefile.am | 2 +-
configure.ac | 2 -
doc-build/Makefile.am | 12 -----
doc-build/README | 9 ----
doc-build/gnome-doc-common.in | 49 --------------------
doc-build/omf.make | 65 --------------------------
doc-build/xmldocs.make | 101 -----------------------------------------
macros2/gnome-autogen.sh | 10 ----
8 files changed, 1 insertions(+), 249 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ddcbe9b..5e4f9f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = macros2 doc-build
+SUBDIRS = macros2
EXTRA_DIST = \
autogen.sh \
diff --git a/configure.ac b/configure.ac
index 3c0e5c2..9d81b72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,6 @@ AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([
Makefile
macros2/Makefile
-doc-build/Makefile
-doc-build/gnome-doc-common
])
AC_OUTPUT
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index 28ee66d..798f1af 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -12,7 +12,6 @@ test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0
test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25
test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0
test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0
-test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0
test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2
# a list of required m4 macros. Package can set an initial value
@@ -332,11 +331,6 @@ if $want_gnome_doc_utils; then
"http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/"
fi
-if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
- version_check gnome-common DOC_COMMON gnome-doc-common \
- $REQUIRED_DOC_COMMON_VERSION " "
-fi
-
check_m4macros
if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
@@ -376,10 +370,6 @@ for configure_ac in $configure_files; do
$GTKDOCIZE --copy || exit 1
fi
- if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then
- printbold "Running gnome-doc-common..."
- gnome-doc-common --copy || exit 1
- fi
if grep "^GNOME_DOC_INIT" $basename >/dev/null; then
printbold "Running $GNOME_DOC_PREPARE..."
$GNOME_DOC_PREPARE --force --copy || exit 1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]