diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2010-08-04 16:06:14 +0100 |
|---|---|---|
| committer | Pekka Pessi <Pekka.Pessi@nokia.com> | 2010-08-19 17:15:03 +0300 |
| commit | 78cd6be0b57a5041ab994c396f6517d0acfdeebd (patch) | |
| tree | e3ca11779bb819285ace5da277ef635f72c14aed | |
| parent | 5c67303b6e90dc56c6e2d9bab0c9159c83187668 (diff) | |
Enable silent builds, if supported
| -rwxr-xr-x | autogen.sh | 28 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | modem/Makefile.am | 4 | ||||
| -rw-r--r-- | ring-extensions/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 4 |
6 files changed, 29 insertions, 12 deletions
@@ -6,14 +6,30 @@ rm -f m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 m4/lt~obso if test -n "$AUTOMAKE"; then : # don't override an explicit user request -elif automake-1.9 --version >/dev/null 2>/dev/null && \ - aclocal-1.9 --version >/dev/null 2>/dev/null; then - # If we have automake-1.9, use it. This helps to ensure that our build - # system doesn't accidentally grow automake-1.10 dependencies. - AUTOMAKE=automake-1.9 +elif automake-1.11 --version >/dev/null 2>/dev/null && \ + aclocal-1.11 --version >/dev/null 2>/dev/null; then + # If we have automake-1.11, use it. This is the oldest version (=> least + # likely to introduce undeclared dependencies) that will give us + # --enable-silent-rules support. + AUTOMAKE=automake-1.11 export AUTOMAKE - ACLOCAL=aclocal-1.9 + ACLOCAL=aclocal-1.11 export ACLOCAL fi autoreconf -i -f + +run_configure=true +for arg in $*; do + case $arg in + --no-configure) + run_configure=false + ;; + *) + ;; + esac +done + +if test $run_configure = true; then + ./configure "$@" +fi diff --git a/configure.ac b/configure.ac index d769696..cc919c5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ AC_INIT([telepathy-ring], [2.0.0]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([foreign 1.9]) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/modem/Makefile.am b/modem/Makefile.am index c63f780..1c658b9 100644 --- a/modem/Makefile.am +++ b/modem/Makefile.am @@ -68,10 +68,10 @@ BUILT_SOURCES = \ signals-marshal.c signals-marshal.c: ${srcdir}/signals-marshal.list - glib-genmarshal --body --prefix=_modem__marshal $< >$@ + $(AM_V_GEN)glib-genmarshal --body --prefix=_modem__marshal $< >$@ signals-marshal.h: ${srcdir}/signals-marshal.list - glib-genmarshal --header --prefix=_modem__marshal $< >$@ + $(AM_V_GEN)glib-genmarshal --header --prefix=_modem__marshal $< >$@ CLEANFILES = ${BUILT_SOURCES} diff --git a/ring-extensions/Makefile.am b/ring-extensions/Makefile.am index 42b36fc..e9e2ea9 100644 --- a/ring-extensions/Makefile.am +++ b/ring-extensions/Makefile.am @@ -15,7 +15,7 @@ NOT_IFACES = \ if HAVE_TP_EXTENSIONS all.xml: all.xml.in Makefile.am - $(SHELL) $(srcdir)/all.xml.in $(EXT_IFACES) > $@ + $(AM_V_GEN) $(SHELL) $(srcdir)/all.xml.in $(EXT_IFACES) > $@ noinst_LIBRARIES = libtpextensions.a diff --git a/src/Makefile.am b/src/Makefile.am index be472c0..c77396d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -82,7 +82,7 @@ service = org.freedesktop.Telepathy.ConnectionManager.ring.service # configure script would insert ${prefix}/lib/telepathy-ring in service file .service-in.service: @-rm -f $@ - sed -e 's![@]libexecdir[@]!${libexecdir}!' '${srcdir}/$@-in' > $@ + $(AM_V_GEN)sed -e 's![@]libexecdir[@]!${libexecdir}!' '${srcdir}/$@-in' > $@ # Install services servicedir = $(DBUS_SERVICES_DIR) diff --git a/tools/Makefile.am b/tools/Makefile.am index 01d5463..2e49c47 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -3,8 +3,8 @@ abs_top_builddir = @abs_top_builddir@ noinst_SCRIPTS = telepathy-glib-env telepathy-glib-env: telepathy-glib-env.in Makefile - sed -e 's![@]abs_top_builddir[@]!$(abs_top_builddir)!' $< > $@ - chmod +x $@ + $(AM_V_GEN)sed -e 's![@]abs_top_builddir[@]!$(abs_top_builddir)!' $< > $@ + $(AM_V_at)chmod +x $@ EXTRA_DIST = \ c-constants-gen.py \ |