Comment out custom silent rules if automake < 1.11

This commit is contained in:
Benjamin Dauvergne 2010-06-15 11:33:01 +00:00
parent 8dd38b7746
commit 751d02ed4d
3 changed files with 6 additions and 0 deletions

View File

@ -9,6 +9,7 @@ INCLUDES = \
CLASSPATH_ENV= CLASSPATH=.:$(CLASSPATH_JUNIT)
CLASSPATH=.:tests
if HAVE_AM_SILENT_RULES
AM_V_JAVAC = $(am__v_JAVAC_$(V))
am__v_JAVAC_ = $(am__v_JAVAC_$(AM_DEFAULT_VERBOSITY))
am__v_JAVAC_0 = @echo " JAVAC " $@;
@ -16,6 +17,7 @@ am__v_JAVAC_0 = @echo " JAVAC " $@;
AM_V_JAR = $(am__v_JAR_$(V))
am__v_JAR_ = $(am__v_JAR_$(AM_DEFAULT_VERBOSITY))
am__v_JAR_0 = @echo " JAR " $@;
endif
java_extension_LTLIBRARIES = libjnilasso.la
java_extensiondir = ${libdir}/java

View File

@ -1,3 +1,4 @@
if HAVE_AM_SILENT_RULES
AM_V_SUBMAKE = $(am__v_SUBMAKE_$(V))
am__v_SUBMAKE_ = $(am__v_SUBMAKE_$(AM_DEFAULT_VERBOSITY))
am__v_SUBMAKE_0 = @echo " SUBMAKE " $@; LOG=`mktemp`; (
@ -5,6 +6,7 @@ am__v_SUBMAKE_0 = @echo " SUBMAKE " $@; LOG=`mktemp`; (
AM_V_SUBMAKE_POSTFIX = $(am__v_SUBMAKE_POSTFIX_$(V))
am__v_SUBMAKE_POSTFIX_ = $(am__v_SUBMAKE_POSTFIX_$(AM_DEFAULT_VERBOSITY))
am__v_SUBMAKE_POSTFIX_0 = 2>&1 >$$LOG && rm $$LOG ) || ( cat $$LOG; rm $$LOG )
endif
MAINTAINERCLEANFILES = Makefile.in
MOSTLYCLEANFILES =

View File

@ -31,6 +31,8 @@ dnl Run many macros mostly needed by configure.ac.
AM_INIT_AUTOMAKE([foreign tar-pax])
dnl Support automake 1.11 silent mode
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes])
AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x)
dnl Create rules to automaticaly regenerate the config header.
AM_CONFIG_HEADER([config.h lasso/lasso_config.h])
dnl Add --enable-maintainer-mode option to configure.