Attachment 35763 Details for Bug 28178 – patch

[patch] patch

0001-Use-AM_SILENT_RULES-instead-of-shave.patch (text/plain), 7.23 KB, created by Adrian Bunk on 2010-05-19 12:24:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Bunk

Created: 2010-05-19 12:24:30 UTC

Size: 7.23 KB

patch

obsolete

>From f45e3c62d4dc355a359f5c07c199d07a752009be Mon Sep 17 00:00:00 2001
>From: Adrian Bunk <bunk@stusta.de>
>Date: Wed, 19 May 2010 22:22:10 +0300
>Subject: Use AM_SILENT_RULES instead of shave
>
>With AM_SILENT_RULES automake now already includes the functionality
>provided by shave.
>---
> build/.gitignore       |    2 -
> build/aclocal.shave.m4 |   77 ---------------------------------------------
> build/shave-libtool.in |   69 ----------------------------------------
> build/shave.in         |   82 ------------------------------------------------
> configure.ac           |    7 +---
> 5 files changed, 2 insertions(+), 235 deletions(-)
> delete mode 100644 build/aclocal.shave.m4
> delete mode 100644 build/shave-libtool.in
> delete mode 100644 build/shave.in
>
>diff --git a/build/.gitignore b/build/.gitignore
>index ce1256a..53f31d7 100644
>--- a/build/.gitignore
>+++ b/build/.gitignore
>@@ -10,5 +10,3 @@ mkinstalldirs
> #Makefile.win32.features-h
> libtool.m4
> lt*.m4
>-shave
>-shave-libtool
>diff --git a/build/aclocal.shave.m4 b/build/aclocal.shave.m4
>deleted file mode 100644
>index 0a3509e..0000000
>--- a/build/aclocal.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)
>-])
>-
>diff --git a/build/shave-libtool.in b/build/shave-libtool.in
>deleted file mode 100644
>index 1f3a720..0000000
>--- a/build/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/shave.in b/build/shave.in
>deleted file mode 100644
>index a23ec29..0000000
>--- a/build/shave.in
>+++ /dev/null
>@@ -1,82 +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   "
>-    ;;
>-*,objc)
>-    Q="  OBJC   "
>-    ;;
>-*,*)
>-    # should not happen
>-    Q="  CC    "
>-    ;;
>-esac
>-
>-lt_unmangle "$lt_output"
>-output=$last_result
>-
>-if test -z $V; then
>-    if test "$output" = "/dev/null"; then
>-	pass_through=1
>-    fi
>-    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/configure.ac b/configure.ac
>index dc54b58..f5d3e1a 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -9,7 +9,8 @@ AC_CONFIG_SRCDIR(src/cairo.h)
> AC_CONFIG_HEADERS(config.h)
> AC_CONFIG_AUX_DIR(build)
> AC_CONFIG_MACRO_DIR(build)
>-AM_INIT_AUTOMAKE([1.9.6 gnu -Wall no-define])
>+AM_INIT_AUTOMAKE([1.11 gnu -Wall no-define])
>+AM_SILENT_RULES([yes])
> AC_LIBTOOL_WIN32_DLL dnl Must be called before AC_PROG_LIBTOOL
> AC_PROG_LIBTOOL dnl ([1.4]) Don't remove!
> DOLT dnl Make my libtool fast!
>@@ -764,11 +765,7 @@ dnl ===========================================================================
> PKG_CHECK_MODULES(gtk, "gtk+-2.0",have_gtk=yes, have_gtk=no)
> AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
> 
>-SHAVE_INIT([build], [enable]) # dnl Make the output pretty
>-
> AC_CONFIG_FILES([
>-build/shave
>-build/shave-libtool
> Makefile
> boilerplate/Makefile
> src/Makefile
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 28178: 35763

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.