[json-glib] build: Remove all stray mentions of Shave
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib] build: Remove all stray mentions of Shave
- Date: Mon, 2 Aug 2010 17:05:23 +0000 (UTC)
commit 7f85693922d1e2614bcce9219d2c6521580dd360
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Mon Aug 2 18:04:21 2010 +0100
build: Remove all stray mentions of Shave
We depend on automake 1.11, now.
.gitignore | 3 ---
autogen.sh | 15 +++------------
build/autotools/Makefile.am | 2 --
configure.ac | 1 -
4 files changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 248ce34..1119e48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,6 @@ Makefile.in
aclocal.m4
autom4te.cache
/build/autotools/*.m4
-/build/autotools/shave-libtool
-/build/autotools/shave
-!/build/autotools/shave.m4
!/build/autotools/as-compiler-flag.m4
!/build/autotools/introspection.m4
!/build/autotools/Makefile.am.*
diff --git a/autogen.sh b/autogen.sh
index f10bc1b..c34893d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,18 +13,9 @@ test ${TEST_TYPE} ${FILE} || {
}
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"
+ echo "*** You need to install gnome-common from GNOME Git:"
+ echo "*** git clone git://git.gnome.org/gnome-common"
exit 1
}
-REQUIRED_AUTOMAKE_VERSION=1.10 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
+REQUIRED_AUTOMAKE_VERSION=1.11 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index dc9b614..e784658 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -7,8 +7,6 @@ EXTRA_DIST = \
Makefile.am.gtest \
Makefile.am.gcov
-DISTCLEANFILES = shave-libtool shave
-
# needed to avoid including Makefile.am.gtest
test-report:
@true
diff --git a/configure.ac b/configure.ac
index 5df86cc..3d41f99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,6 @@ echo " â?¢ Prefix: ${prefix}"
echo ""
echo " â?¢ Debug level: ${enable_debug}"
echo " â?¢ Compiler flags: ${MAINTAINER_CFLAGS}"
-echo " â?¢ Use shave: ${use_shave}"
echo ""
echo " â?¢ API reference: ${enable_gtk_doc}"
echo ""
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]