diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-01-18 04:05:38 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonnylamb@gnome.org> | 2010-01-18 05:57:13 +0800 |
| commit | f687777360a213c638374c1d497ca849717ce174 (patch) | |
| tree | 3a6740e80f8e240d11942c99b028838b095eed6c /m4/shave.m4 | |
| parent | 6a1aecd8b35cee47c56326d4babc46a146a91be0 (diff) | |
| download | gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.gz gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.bz2 gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.lz gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.xz gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.tar.zst gsoc2013-empathy-f687777360a213c638374c1d497ca849717ce174.zip | |
Support silent build rules with automake 1.11
Support silent build rules, requires at least automake-1.11.
Disable by either passing --disable-silent-rules to configure or
passing V=1 to make.
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=585364
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
Diffstat (limited to 'm4/shave.m4')
| -rw-r--r-- | m4/shave.m4 | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/m4/shave.m4 b/m4/shave.m4 deleted file mode 100644 index 0a3509e59..000000000 --- a/m4/shave.m4 +++ /dev/null @@ -1,77 +0,0 @@ -dnl Make automake/libtool output more friendly to humans -dnl Damien Lespiau <damien.lespiau@gmail.com> -dnl -dnl SHAVE_INIT([shavedir],[default_mode]) -dnl -dnl shavedir: the directory where the shave scripts are, it defaults to -dnl $(top_builddir) -dnl default_mode: (enable|disable) default shave mode. This parameter -dnl controls shave's behaviour when no option has been -dnl given to configure. It defaults to disable. -dnl -dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just -dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and -dnl LIBTOOL, you don't want the configure tests to have these variables -dnl re-defined. -dnl * This macro requires GNU make's -s option. - -AC_DEFUN([_SHAVE_ARG_ENABLE], -[ - AC_ARG_ENABLE([shave], - AS_HELP_STRING( - [--enable-shave], - [use shave to make the build pretty [[default=$1]]]),, - [enable_shave=$1] - ) -]) - -AC_DEFUN([SHAVE_INIT], -[ - dnl you can tweak the default value of enable_shave - m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) - - if test x"$enable_shave" = xyes; then - dnl where can we find the shave scripts? - m4_if([$1],, - [shavedir="$ac_pwd"], - [shavedir="$ac_pwd/$1"]) - AC_SUBST(shavedir) - - dnl make is now quiet - AC_SUBST([MAKEFLAGS], [-s]) - AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) - - dnl we need sed - AC_CHECK_PROG(SED,sed,sed,false) - - dnl substitute libtool - SHAVE_SAVED_LIBTOOL=$LIBTOOL - LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" - AC_SUBST(LIBTOOL) - - dnl substitute cc/cxx - SHAVE_SAVED_CC=$CC - SHAVE_SAVED_CXX=$CXX - SHAVE_SAVED_FC=$FC - SHAVE_SAVED_F77=$F77 - SHAVE_SAVED_OBJC=$OBJC - CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" - CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" - FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" - F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" - OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" - AC_SUBST(CC) - AC_SUBST(CXX) - AC_SUBST(FC) - AC_SUBST(F77) - AC_SUBST(OBJC) - - V=@ - else - V=1 - fi - Q='$(V:1=)' - AC_SUBST(V) - AC_SUBST(Q) -]) - |