From 8ceb93d9259042cc29498f26e25fa6577bf28417 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 16 Aug 2009 22:59:31 -0400 Subject: Excise shave in favor of automake 1.11 silent rules Shave is just way too invasive in the build system. --- m4/shave.m4 | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 m4/shave.m4 (limited to 'm4') diff --git a/m4/shave.m4 b/m4/shave.m4 deleted file mode 100644 index 5b1f6756..00000000 --- a/m4/shave.m4 +++ /dev/null @@ -1,40 +0,0 @@ -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) -]) - -- cgit v1.2.1