OSDN -- 开发和下载开源软件
简体中文翻译状态 translation status for zh
  • R/O
  • SSH
  • HTTPS

kazehakase: 提交


Commit MetaInfo

修订版3867 (tree)
时间2009-10-03 13:56:01
作者ikezoe

Log Message

Use AM_SILENT_RULES instead of shave.

更改概述

差异

--- kazehakase/trunk/shave/shave.in (revision 3866)
+++ kazehakase/trunk/shave/shave.in (nonexistent)
@@ -1,76 +0,0 @@
1-#!/bin/sh
2-
3-# we need sed
4-SED=@SED@
5-if test -z "$SED" ; then
6-SED=sed
7-fi
8-
9-lt_unmangle ()
10-{
11- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
12-}
13-
14-# the tool to wrap (cc, cxx, ar, ranlib, ..)
15-tool="$1"
16-shift
17-
18-# the reel tool (to call)
19-REEL_TOOL="$1"
20-shift
21-
22-pass_through=0
23-preserved_args=
24-while test "$#" -gt 0; do
25- opt="$1"
26- shift
27-
28- case $opt in
29- --shave-mode=*)
30- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
31- ;;
32- -o)
33- lt_output="$1"
34- preserved_args="$preserved_args $opt"
35- ;;
36- *)
37- preserved_args="$preserved_args $opt"
38- ;;
39- esac
40-done
41-
42-# mode=link is handled in the libtool wrapper
43-case "$mode,$tool" in
44-link,*)
45- pass_through=1
46- ;;
47-*,cxx)
48- Q=" CXX "
49- ;;
50-*,cc)
51- Q=" CC "
52- ;;
53-*,fc)
54- Q=" FC "
55- ;;
56-*,f77)
57- Q=" F77 "
58- ;;
59-*,*)
60- # should not happen
61- Q=" CC "
62- ;;
63-esac
64-
65-lt_unmangle "$lt_output"
66-output=$last_result
67-
68-if test -z $V; then
69- if test $pass_through -eq 0; then
70- echo "$Q$output"
71- fi
72- $REEL_TOOL $preserved_args
73-else
74- echo $REEL_TOOL $preserved_args
75- $REEL_TOOL $preserved_args
76-fi
--- kazehakase/trunk/shave/shave-libtool.in (revision 3866)
+++ kazehakase/trunk/shave/shave-libtool.in (nonexistent)
@@ -1,69 +0,0 @@
1-#!/bin/sh
2-
3-# we need sed
4-SED=@SED@
5-if test -z "$SED" ; then
6-SED=sed
7-fi
8-
9-lt_unmangle ()
10-{
11- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
12-}
13-
14-# the real libtool to use
15-LIBTOOL="$1"
16-shift
17-
18-# if 1, don't print anything, the underlaying wrapper will do it
19-pass_though=0
20-
21-# scan the arguments, keep the right ones for libtool, and discover the mode
22-preserved_args=
23-while test "$#" -gt 0; do
24- opt="$1"
25- shift
26-
27- case $opt in
28- --mode=*)
29- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
30- preserved_args="$preserved_args $opt"
31- ;;
32- -o)
33- lt_output="$1"
34- preserved_args="$preserved_args $opt"
35- ;;
36- *)
37- preserved_args="$preserved_args $opt"
38- ;;
39- esac
40-done
41-
42-case "$mode" in
43-compile)
44- # shave will be called and print the actual CC/CXX/LINK line
45- preserved_args="$preserved_args --shave-mode=$mode"
46- pass_though=1
47- ;;
48-link)
49- preserved_args="$preserved_args --shave-mode=$mode"
50- Q=" LINK "
51- ;;
52-*)
53- # let's u
54- # echo "*** libtool: Unimplemented mode: $mode, fill a bug report"
55- ;;
56-esac
57-
58-lt_unmangle "$lt_output"
59-output=$last_result
60-
61-if test -z $V; then
62- if test $pass_though -eq 0; then
63- echo "$Q$output"
64- fi
65- $LIBTOOL --silent $preserved_args
66-else
67- echo $LIBTOOL $preserved_args
68- $LIBTOOL $preserved_args
69-fi
--- kazehakase/trunk/macros/shave.m4 (revision 3866)
+++ kazehakase/trunk/macros/shave.m4 (nonexistent)
@@ -1,73 +0,0 @@
1-dnl Make automake/libtool output more friendly to humans
2-dnl
3-dnl SHAVE_INIT([shavedir],[default_mode])
4-dnl
5-dnl shavedir: the directory where the shave scripts are, it defaults to
6-dnl $(top_builddir)
7-dnl default_mode: (enable|disable) default shave mode. This parameter
8-dnl controls shave's behaviour when no option has been
9-dnl given to configure. It defaults to disable.
10-dnl
11-dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
12-dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and
13-dnl LIBTOOL, you don't want the configure tests to have these variables
14-dnl re-defined.
15-dnl * This macro requires GNU make's -s option.
16-
17-AC_DEFUN([_SHAVE_ARG_ENABLE],
18-[
19- AC_ARG_ENABLE([shave],
20- AS_HELP_STRING(
21- [--enable-shave],
22- [use shave to make the build pretty [[default=$1]]]),,
23- [enable_shave=$1]
24- )
25-])
26-
27-AC_DEFUN([SHAVE_INIT],
28-[
29- dnl you can tweak the default value of enable_shave
30- m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
31-
32- if test x"$enable_shave" = xyes; then
33- dnl where can we find the shave scripts?
34- m4_if([$1],,
35- [shavedir="$ac_pwd"],
36- [shavedir="$ac_pwd/$1"])
37- AC_SUBST(shavedir)
38-
39- dnl make is now quiet
40- AC_SUBST([MAKEFLAGS], [-s])
41- AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
42-
43- dnl we need sed
44- AC_CHECK_PROG(SED,sed,sed,false)
45-
46- dnl substitute libtool
47- SHAVE_SAVED_LIBTOOL=$LIBTOOL
48- LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
49- AC_SUBST(LIBTOOL)
50-
51- dnl substitute cc/cxx
52- SHAVE_SAVED_CC=$CC
53- SHAVE_SAVED_CXX=$CXX
54- SHAVE_SAVED_FC=$FC
55- SHAVE_SAVED_F77=$F77
56- CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
57- CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
58- FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
59- F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
60- AC_SUBST(CC)
61- AC_SUBST(CXX)
62- AC_SUBST(FC)
63- AC_SUBST(F77)
64-
65- V=@
66- else
67- V=1
68- fi
69- Q='$(V:1=)'
70- AC_SUBST(V)
71- AC_SUBST(Q)
72-])
73-
--- kazehakase/trunk/configure.ac (revision 3866)
+++ kazehakase/trunk/configure.ac (revision 3867)
@@ -3,6 +3,7 @@
33
44 AC_INIT(kazehakase, 0.5.8)
55 AM_INIT_AUTOMAKE(1.6)
6+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
67 AM_CONFIG_HEADER(config.h)
78
89 AC_CANONICAL_HOST
--- kazehakase/trunk/.gitignore (revision 3866)
+++ kazehakase/trunk/.gitignore (revision 3867)
@@ -42,6 +42,4 @@
4242 po/POTFILES
4343 po/stamp-it
4444 src/kazehakase
45-shave/shave
46-shave/shave-libtool
4745 *-bindings.h
Show on old repository browser