svnno****@sourc*****
svnno****@sourc*****
Sat Oct 3 13:56:01 JST 2009
Revision: 3867
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3867
Author: ikezoe
Date: 2009-10-03 13:56:01 +0900 (Sat, 03 Oct 2009)
Log Message:
-----------
Use AM_SILENT_RULES instead of shave.
Modified Paths:
--------------
kazehakase/trunk/.gitignore
kazehakase/trunk/configure.ac
Removed Paths:
-------------
kazehakase/trunk/macros/shave.m4
kazehakase/trunk/shave/
Modified: kazehakase/trunk/.gitignore
===================================================================
--- kazehakase/trunk/.gitignore 2009-10-03 04:49:45 UTC (rev 3866)
+++ kazehakase/trunk/.gitignore 2009-10-03 04:56:01 UTC (rev 3867)
@@ -42,6 +42,4 @@
po/POTFILES
po/stamp-it
src/kazehakase
-shave/shave
-shave/shave-libtool
*-bindings.h
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2009-10-03 04:49:45 UTC (rev 3866)
+++ kazehakase/trunk/configure.ac 2009-10-03 04:56:01 UTC (rev 3867)
@@ -3,6 +3,7 @@
AC_INIT(kazehakase, 0.5.8)
AM_INIT_AUTOMAKE(1.6)
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
Deleted: kazehakase/trunk/macros/shave.m4
===================================================================
--- kazehakase/trunk/macros/shave.m4 2009-10-03 04:49:45 UTC (rev 3866)
+++ kazehakase/trunk/macros/shave.m4 2009-10-03 04:56:01 UTC (rev 3867)
@@ -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)
-])
-