marlin r1360 - in trunk: . common marlin

[iain svn gnome org]

Author: iain
Date: Sat Feb 21 17:41:45 2009
New Revision: 1360
URL: http://svn.gnome.org/viewvc/marlin?rev=1360&view=rev

Log:
Shave the output


Added:
   trunk/common/Makefile.am
   trunk/common/shave-libtool.in
   trunk/common/shave.in
   trunk/common/shave.m4
Modified:
   trunk/Makefile.am
   trunk/configure.in
   trunk/marlin/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Feb 21 17:41:45 2009
@@ -4,8 +4,10 @@
 
 @INTLTOOL_DESKTOP_RULE@
 
-SUBDIRS=marlin pixmaps src plugins doc po
+SUBDIRS=marlin pixmaps src plugins po doc
+DIST_SUBDIRS = marlin pixmaps src plugins po doc common
 
+ACLOCAL_AMFLAGS = -I common
 CLEANFILES = \
 	$(desktop_DATA)
 

Added: trunk/common/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/common/Makefile.am	Sat Feb 21 17:41:45 2009
@@ -0,0 +1,4 @@
+EXTRA_DIST =			\
+	shave.in		\
+	shave-libtool.in	\
+	shave.m4

Added: trunk/common/shave-libtool.in
==============================================================================
--- (empty file)
+++ trunk/common/shave-libtool.in	Sat Feb 21 17:41:45 2009
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# we need sed
+SED= SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+Xsed="$SED -e s/^X//"
+
+lt_unmangle ()
+{
+   last_result=`echo -n X$1 | $Xsed -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 "X$opt" | $Xsed -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

Added: trunk/common/shave.in
==============================================================================
--- (empty file)
+++ trunk/common/shave.in	Sat Feb 21 17:41:45 2009
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# we need sed
+SED= SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+Xsed="$SED -e s/^X//"
+
+lt_unmangle ()
+{
+   last_result=`echo -n X$1 | $Xsed -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 "X$opt" | $Xsed -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
+    ;;
+compile,cxx)
+    Q="  CXX   "
+    ;;
+compile,cc|*,*)
+    # no "libtool" mode has been given, we are called by the Makefile:
+    # -> assume compilation
+    mode=compile
+    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

Added: trunk/common/shave.m4
==============================================================================
--- (empty file)
+++ trunk/common/shave.m4	Sat Feb 21 17:41:45 2009
@@ -0,0 +1,40 @@
+dnl Make automake/libtool output more friendly to humans
+dnl
+dnl SHAVE_INIT([shavedir])
+dnl
+dnl shavedir: the directory where the shave script is, it defaults to
+dnl           $(top_builddir)
+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 rewrite 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_INIT], [
+dnl where can we find the shave scripts?
+m4_if([$1],,
+  [shavedir='$(top_builddir)'],
+  [shavedir='$(top_builddir)'/$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
+AC_SUBST(SHAVE_SAVED_LIBTOOL)
+LIBTOOL="\$(SHELL) \$(shavedir)/shave-libtool '\$(SHAVE_SAVED_LIBTOOL)'"
+AC_SUBST(LIBTOOL)
+dnl substitute cc
+SHAVE_SAVED_CC=$CC
+SHAVE_SAVED_CXX=$CXX
+AC_SUBST(SHAVE_SAVED_CC)
+AC_SUBST(SHAVE_SAVED_CXX)
+CC="\$(SHELL) \$(shavedir)/shave cc '\$(SHAVE_SAVED_CC)'"
+CXX="\$(SHELL) \$(shavedir)/shave cxx '\$(SHAVE_SAVED_CXX)'"
+AC_SUBST(CC)
+AC_SUBST(CXX)
+])
+

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Feb 21 17:41:45 2009
@@ -1,10 +1,11 @@
 AC_PREREQ(2.53)
-AC_INIT(marlin, 0.14, http://live.gnome.org/Marlin)
+AC_INIT([marlin], [0.14], [http://live.gnome.org/Marlin])
 
-AC_CONFIG_SRCDIR(src/main.c)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_MACRO_DIR([common])
+AC_CONFIG_SRCDIR([src/main.c])
+AM_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
-MARLIN_VERSION=0.13
+MARLIN_VERSION=0.14
 
 AC_PROG_INTLTOOL([0.21])
 
@@ -171,9 +172,14 @@
 	CFLAGS="-g -O0 -Wall -Werror -Wno-format"
 fi
 
+SHAVE_INIT(common)
+
 AC_CONFIG_FILES([
 Makefile
 marlin.spec
+common/Makefile
+common/shave
+common/shave-libtool
 doc/Makefile
 doc/C/Makefile
 doc/random/Makefile

Modified: trunk/marlin/Makefile.am
==============================================================================
--- trunk/marlin/Makefile.am	(original)
+++ trunk/marlin/Makefile.am	Sat Feb 21 17:41:45 2009
@@ -1,3 +1,8 @@
+# For shaving stuff
+V = @
+Q = $(V:1=)
+QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
+
 SUBDIRS = cursors
 
 lib_LTLIBRARIES = libmarlin-soundtouch.la libmarlin.la libmarlinx.la
@@ -200,10 +205,10 @@
 test_grid_CFLAGS = $(MARLIN_CFLAGS) $(MARLINX_CFLAGS)
 
 marlin-marshal.h: marlin-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=marlin_marshal > $@
+	$(QUIET_GEN)$(GLIB_GENMARSHAL) $< --header --prefix=marlin_marshal > $@
 
 marlin-marshal.c: marlin-marshal.list marlin-marshal.h $(GLIB_GENMARSHAL)
-	echo "#include \"marlin-marshal.h\"" > $@ \
+	$(QUIET_GEN)echo "#include \"marlin-marshal.h\"" > $@ \
 	&& $(GLIB_GENMARSHAL) --prefix=marlin_marshal $(srcdir)/marlin-marshal.list --body >> $@
 
 EXTRA_DIST = 					\