Build system: replace "shave" script by AM_SILENT_RULES

Use AM_SILENT_RULES in favor of "shave" if automake >= 1.11 is available. Otherwise, disable silent build.
Aegisub · Jun 26, 2010 · defb18d · defb18d
1 parent 457b563
commit defb18d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 324 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I shave
+ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = libass.pc.in Changelog
 

diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,6 @@
 AC_INIT(libass, 0.9.9)
 AM_INIT_AUTOMAKE
-AC_CONFIG_MACRO_DIR([shave])
+AC_CONFIG_MACRO_DIR([m4])
 # Disable C++/Fortran checks
 define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
@@ -88,10 +88,10 @@ fi
 AC_SUBST([PKG_REQUIRES])
 
 # Setup output beautifier.
-SHAVE_INIT([shave], [enable])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # More sensible compile flags
 CFLAGS="$CFLAGS -Wall"
 
-AC_CONFIG_FILES([Makefile libass/Makefile test/Makefile libass.pc shave/shave shave/shave-libtool])
+AC_CONFIG_FILES([Makefile libass/Makefile test/Makefile libass.pc])
 AC_OUTPUT
diff --git a/m4/.gitignore b/m4/.gitignore
diff --git a/shave/shave-libtool.in b/shave/shave-libtool.in
diff --git a/shave/shave.in b/shave/shave.in
diff --git a/shave/shave.m4 b/shave/shave.m4