From e07b28ed547a4b0af98bb588901a1b75b79e0e02 Mon Sep 17 00:00:00 2001
From: Damien Lespiau <damien.lespiau@intel.com>
Date: Fri, 19 Feb 2010 12:01:12 +0100
Subject: build: Switch from shave to AM_SILENT_RULES

It's a fact, shave is dead, automake's silent rules are the way forward
to have more silent builds.
---
 build/autotools/.gitignore         |  3 --
 build/autotools/Makefile.am        |  3 --
 build/autotools/Makefile.am.silent | 15 ++++++++
 build/autotools/shave-libtool.in   | 69 ----------------------------------
 build/autotools/shave.in           | 76 --------------------------------------
 build/autotools/shave.m4           | 73 ------------------------------------
 clutter-gst/Makefile.am            |  3 +-
 clutter-gst/shaders/Makefile.am    |  6 +--
 configure.ac                       |  8 ++--
 9 files changed, 24 insertions(+), 232 deletions(-)
 create mode 100644 build/autotools/Makefile.am.silent
 delete mode 100644 build/autotools/shave-libtool.in
 delete mode 100644 build/autotools/shave.in
 delete mode 100644 build/autotools/shave.m4

diff --git a/build/autotools/.gitignore b/build/autotools/.gitignore
index 55b3560..3b529c0 100644
--- a/build/autotools/.gitignore
+++ b/build/autotools/.gitignore
@@ -2,6 +2,3 @@
 !as-compiler-flag.m4
 !dolt.m4
 !introspection.m4
-!shave.m4
-shave
-shave-libtool
diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am
index 712cfbf..95d3135 100644
--- a/build/autotools/Makefile.am
+++ b/build/autotools/Makefile.am
@@ -4,7 +4,4 @@ EXTRA_DIST = \
 	as-compiler-flag.m4	\
 	dolt.m4			\
 	introspection.m4	\
-	shave.in		\
-	shave-libtool.in	\
-	shave.m4		\
 	$(NULL)
diff --git a/build/autotools/Makefile.am.silent b/build/autotools/Makefile.am.silent
new file mode 100644
index 0000000..cb0260d
--- /dev/null
+++ b/build/autotools/Makefile.am.silent
@@ -0,0 +1,15 @@
+# custom rules for quiet builds
+
+QUIET_GEN   = $(AM_V_GEN)
+
+QUIET_CGC   = $(QUIET_CGC_$(V))
+QUIET_CGC_  = $(QUIET_CGC_$(AM_DEFAULT_VERBOSITY))
+QUIET_CGC_0 = @echo '  CGC    '$@;
+
+QUIET_LN    = $(QUIET_LN_$(V))
+QUIET_LN_   = $(QUIET_LN_$(AM_DEFAULT_VERBOSITY))
+QUIET_LN_0  = @echo '  LN     '$@;
+
+QUIET_RM    = $(QUIET_RM_$(V))
+QUIET_RM_   = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY))
+QUIET_RM_0  = @echo '  RM     '$@;
diff --git a/build/autotools/shave-libtool.in b/build/autotools/shave-libtool.in
deleted file mode 100644
index 1f3a720..0000000
--- a/build/autotools/shave-libtool.in
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# we need sed
-SED=@SED@
-if test -z "$SED" ; then
-SED=sed
-fi
-
-lt_unmangle ()
-{
-   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
-}
-
-# the real libtool to use
-LIBTOOL="$1"
-shift
-
-# if 1, don't print anything, the underlaying wrapper will do it
-pass_though=0
-
-# scan the arguments, keep the right ones for libtool, and discover the mode
-preserved_args=
-while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-    --mode=*)
-        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
-        preserved_args="$preserved_args $opt"
-        ;;
-    -o)
-        lt_output="$1"
-        preserved_args="$preserved_args $opt"
-	;;
-    *)
-        preserved_args="$preserved_args $opt"
-        ;;
-      esac
-done
-
-case "$mode" in
-compile)
-    # shave will be called and print the actual CC/CXX/LINK line
-    preserved_args="$preserved_args --shave-mode=$mode"
-    pass_though=1
-    ;;
-link)
-    preserved_args="$preserved_args --shave-mode=$mode"
-    Q="  LINK  "
-    ;;
-*)
-    # let's u
-    # echo "*** libtool: Unimplemented mode: $mode, fill a bug report"
-    ;;
-esac
-
-lt_unmangle "$lt_output"
-output=$last_result
-
-if test -z $V; then
-    if test $pass_though -eq 0; then
-        echo "$Q$output"
-    fi
-    $LIBTOOL --silent $preserved_args
-else
-    echo $LIBTOOL $preserved_args
-    $LIBTOOL $preserved_args
-fi
diff --git a/build/autotools/shave.in b/build/autotools/shave.in
deleted file mode 100644
index 174641e..0000000
--- a/build/autotools/shave.in
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-
-# we need sed
-SED=@SED@
-if test -z "$SED" ; then
-SED=sed
-fi
-
-lt_unmangle ()
-{
-   last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
-}
-
-# the tool to wrap (cc, cxx, ar, ranlib, ..)
-tool="$1"
-shift
-
-# the reel tool (to call)
-REEL_TOOL="$1"
-shift
-
-pass_through=0
-preserved_args=
-while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-    --shave-mode=*)
-        mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
-	;;
-    -o)
-        lt_output="$1"
-        preserved_args="$preserved_args $opt"
-	;;
-    *)
-        preserved_args="$preserved_args $opt"
-        ;;
-      esac
-done
-
-# mode=link is handled in the libtool wrapper
-case "$mode,$tool" in
-link,*)
-    pass_through=1
-    ;;
-*,cxx)
-    Q="  CXX   "
-    ;;
-*,cc)
-    Q="  CC    "
-    ;;
-*,fc)
-    Q="  FC    "
-    ;;
-*,f77)
-    Q="  F77   "
-    ;;
-*,*)
-    # should not happen
-    Q="  CC    "
-    ;;
-esac
-
-lt_unmangle "$lt_output"
-output=$last_result
-
-if test -z $V; then
-    if test $pass_through -eq 0; then
-        echo "$Q$output"
-    fi
-    $REEL_TOOL $preserved_args
-else
-    echo $REEL_TOOL $preserved_args
-    $REEL_TOOL $preserved_args
-fi
diff --git a/build/autotools/shave.m4 b/build/autotools/shave.m4
deleted file mode 100644
index 0c2c9f5..0000000
--- a/build/autotools/shave.m4
+++ /dev/null
@@ -1,73 +0,0 @@
-dnl Make automake/libtool output more friendly to humans
-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
-    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}"
-    AC_SUBST(CC)
-    AC_SUBST(CXX)
-    AC_SUBST(FC)
-    AC_SUBST(F77)
-
-    V=@
-  else
-    V=1
-  fi
-  Q='$(V:1=)'
-  AC_SUBST(V)
-  AC_SUBST(Q)
-])
-
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
index ab2b4ad..ba1b7bc 100644
--- a/clutter-gst/Makefile.am
+++ b/clutter-gst/Makefile.am
@@ -1,5 +1,6 @@
+include $(top_srcdir)/build/autotools/Makefile.am.silent
+
 NULL = #
-QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
 
 SUBDIRS = shaders
 
diff --git a/clutter-gst/shaders/Makefile.am b/clutter-gst/shaders/Makefile.am
index 8ec1e98..d6a9e2f 100644
--- a/clutter-gst/shaders/Makefile.am
+++ b/clutter-gst/shaders/Makefile.am
@@ -1,6 +1,6 @@
-QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)
-QUIET_CGC = $(Q:@=@echo '  CGC   '$@;)
-NULL =
+include $(top_srcdir)/build/autotools/Makefile.am.silent
+
+NULL = #
 
 CLEANFILES =
 EXTRA_DIST = I420.cg I420.pso I420.h \
diff --git a/configure.ac b/configure.ac
index 5c1cd24..b378143 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,10 @@ AC_SUBST(CLUTTER_GST_LT_LDFLAGS)
 
 dnl ========================================================================
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
+dnl ========================================================================
+
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -178,14 +182,10 @@ AC_SUBST(GST_LIBS)
 AC_SUBST(CLUTTER_GST_CFLAGS)
 AC_SUBST(CLUTTER_GST_LIBS)
 
-SHAVE_INIT([build/autotools], [enable])
-
 AC_OUTPUT([
         Makefile
         build/Makefile
         build/autotools/Makefile
-        build/autotools/shave
-        build/autotools/shave-libtool
         scripts/Makefile
         clutter-gst/Makefile
         clutter-gst/clutter-gst-version.h
-- 
cgit v1.2.1