[gtkmm] Support Automake silent rules
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtkmm] Support Automake silent rules
- Date: Sat, 19 Sep 2009 22:30:53 +0000 (UTC)
commit d3e07011e0474896e60eaa544981911fc64abbbe
Author: Daniel Elstner <daniel kitta gmail com>
Date: Sun Sep 20 00:16:42 2009 +0200
Support Automake silent rules
* configure.ac: Call the AM_SILENT_RULES macro if it is defined.
(MM_INIT_MODULE): Move block below Automake initialization.
* autogen.sh: Pass --verbose option to autoreconf.
ChangeLog | 8 ++++++++
autogen.sh | 4 ++--
configure.ac | 12 +++++++-----
3 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 60b9ccc..0f59907 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-19 Daniel Elstner <daniel kitta gmail com>
+
+ Support Automake silent rules
+
+ * configure.ac: Call the AM_SILENT_RULES macro if it is defined.
+ (MM_INIT_MODULE): Move block below Automake initialization.
+ * autogen.sh: Pass --verbose option to autoreconf.
+
2009-09-18 Daniel Elstner <danielk openismus com>
Fix build with deprecated C API disabled
diff --git a/autogen.sh b/autogen.sh
index fed2c5b..6686611 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,6 @@
test -n "$srcdir" || srcdir=`dirname "$0"`
test -n "$srcdir" || srcdir=.
-mm-common-prepare --force --copy "$srcdir"
-autoreconf --force --install "$srcdir"
+mm-common-prepare --copy --force "$srcdir"
+autoreconf --force --install --verbose "$srcdir"
test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index f2d088a..3e60d63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,8 @@
## You should have received a copy of the GNU Lesser General Public License
## along with this library. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([gtkmm], [2.17.11], [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
+AC_INIT([gtkmm], [2.17.11],
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=gtkmm],
[gtkmm], [http://www.gtkmm.org/])
AC_PREREQ([2.59])
@@ -24,6 +25,11 @@ AC_CONFIG_AUX_DIR([build])
AC_CONFIG_MACRO_DIR([build])
AC_CONFIG_HEADERS([config.h gdk/gdkmmconfig.h gtk/gtkmmconfig.h])
+AM_INIT_AUTOMAKE([1.9 -Wno-portability check-news dist-bzip2 no-define nostdinc tar-pax])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
+AM_MAINTAINER_MODE
+AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
+
MM_PREREQ([0.7.1])
MM_INIT_MODULE([atkmm-1.6])
MM_INIT_MODULE([gdkmm-2.4])
@@ -32,10 +38,6 @@ MM_INIT_MODULE([gtkmm-2.4])
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
AC_SUBST([LIBGTKMM_SO_VERSION], [1:30:0])
-AM_INIT_AUTOMAKE([1.9 -Wno-portability check-news dist-bzip2 no-define nostdinc tar-pax])
-AM_MAINTAINER_MODE
-AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
-
AC_PROG_CXX
AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]