From 9da2af345bbc3848d181319a77b830c77034ae1e Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Sat, 29 Dec 2012 14:32:45 +0000 Subject: build system: Enable "silent rules" (see Automake manual) git-svn-id: svn://tug.org/texlive/trunk@28654 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/Makefile.in | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'Build/source/texk/Makefile.in') diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 69c2cb6e74e..f3f4bac3ad2 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -82,6 +82,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \ $(top_srcdir)/../m4/kpse-setup.m4 \ $(top_srcdir)/../m4/kpse-t1lib-flags.m4 \ $(top_srcdir)/../m4/kpse-teckit-flags.m4 \ + $(top_srcdir)/../m4/kpse-warnings.m4 \ $(top_srcdir)/../m4/kpse-web2c.m4 \ $(top_srcdir)/../m4/kpse-win32.m4 \ $(top_srcdir)/../m4/kpse-xpdf-flags.m4 \ @@ -93,6 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \ $(top_srcdir)/../utils/ps2eps/ac/withenable.ac \ $(top_srcdir)/../utils/psutils/ac/withenable.ac \ $(top_srcdir)/../utils/t1utils/ac/withenable.ac \ + $(top_srcdir)/../utils/texdoctk/ac/withenable.ac \ $(top_srcdir)/../utils/tpic2pdftex/ac/withenable.ac \ $(top_srcdir)/../utils/vlna/ac/withenable.ac \ $(top_srcdir)/../utils/xindy/ac/withenable.ac \ @@ -165,6 +167,18 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -231,6 +245,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -273,6 +288,7 @@ SHELL = @SHELL@ STRIP = @STRIP@ SUBTEXK = @SUBTEXK@ VERSION = @VERSION@ +WARNING_CFLAGS = @WARNING_CFLAGS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -327,6 +343,10 @@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../m4 --force SUBDIRS = . $(SUBTEXK) DIST_SUBDIRS = $(DIST_SUBTEXK) +cf_silent = $(cf_silent_@AM_V@) +cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) +cf_silent_0 = --silent +cf_silent_1 = CONFIG_AUX = ../subsubdir-conf.cmd # Common infrastructure for tests @@ -827,7 +847,7 @@ all-local: subtexk # we append '--disable-build' so they can skip tests that would # fail because, e.g., some required libraries were not built. # -# Sequentially configure and optionally build all texk subdirs; +# Sequentially configure and optionally build all texk programs; # code inspired by automake's way to handle recursive targets. subtexk: $(CONFIG_AUX) @fail= failcom='exit 1'; \ @@ -846,9 +866,9 @@ subtexk: $(CONFIG_AUX) *) skip=' --disable-build';; \ esac; \ (cd $$subtexk && echo "=== configuring in $$subtexk (`pwd`)" && \ - echo "make: running $(SHELL) $$cmd$$skip" && \ + if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \ CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \ - eval $(SHELL) $$cmd$$skip || \ + eval $(SHELL) $$cmd$$skip $(cf_silent) || \ { echo "=== configuring in $$subtexk failed"; exit 1; }) && \ if test "x$$skip" = x; then \ echo "Making all in $$subtexk" && \ -- cgit v1.2.3