[unique] [build] Patch gtk-doc.make on autogen
- From: Emmanuele Bassi <ebassi src gnome org>
- To: svn-commits-list gnome org
- Subject: [unique] [build] Patch gtk-doc.make on autogen
- Date: Mon, 13 Apr 2009 17:57:43 -0400 (EDT)
commit d89e69f66462631cc3790652ebe299cf2419f552
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Apr 13 22:45:23 2009 +0100
[build] Patch gtk-doc.make on autogen
There is a slight issue with gtk-doc's make rules, libtool 1.5 and the
shave scripts; it has been fixed upstream and will be available in
gtk-doc 1.12, but for the time being we need to live-patch the
gtk-doc.make at the end of the autogen process.
---
autogen.sh | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 75aa6ed..ff7830a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,18 +13,20 @@ test ${TEST_TYPE} ${FILE} || {
exit 1
}
-GTKDOCIZE=`which gtkdocize`
-if test -z $GTKDOCIZE; then
- echo "*** No gtk-doc support ***"
- echo "EXTRA_DIST =" > gtk-doc.make
-else
- gtkdocize || exit $?
-fi
-
which gnome-autogen.sh || {
echo "*** You need to install gnome-common from GNOME SVN:"
echo "*** svn co http://svn.gnome.org/svn/gnome-common/trunk gnome-common"
exit 1
}
-REQUIRED_AUTOMAKE_VERSION=1.8 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
+
+# we need to patch gtk-doc.make to support pretty output with
+# libtool 1.x. Should be fixed in the next version of gtk-doc.
+# To be more resilient with the various versions of gtk-doc one
+# can find, just sed gkt-doc.make rather than patch it.
+sed -e 's#) --mode=compile#) --tag=CC --mode=compile#' gtk-doc.make > gtk-doc.temp \
+ && mv gtk-doc.temp gtk-doc.make
+sed -e 's#) --mode=link#) --tag=CC --mode=link#' gtk-doc.make > gtk-doc.temp \
+ && mv gtk-doc.temp gtk-doc.make
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]