From e981cdbd1662ed82436259f1046987c5b7204f1a Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 9 Sep 2013 10:07:08 +0000 Subject: Various updates of build system: Use AC_CONFIG_MACRO_DIRS instead of ACLOCAL_AMFLAGS, Factor recursion into subdirs into .am fragment and m4 macros, Avoid unnecessary use of Libtool, Use z_const git-svn-id: svn://tug.org/texlive/trunk@31606 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/Makefile.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Build/source/texk/Makefile.in') diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 8af34ab4ab4..dad9f035f09 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/Makefile.in @@ -393,13 +393,8 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../m4 --force SUBDIRS = . $(MAKE_SUBDIRS) DIST_SUBDIRS = $(CONF_SUBDIRS) -cf_silent = $(cf_silent_@AM_V@) -cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) -cf_silent_0 = --silent -cf_silent_1 = recurse_this = texk/ recurse_top = ../ @@ -408,6 +403,10 @@ recurse_top = ../ # we append '--disable-build' so they can skip tests that would # fail because, e.g., some required libraries were not built. # Code inspired by automake's way to handle recursive targets. +cf_silent = $(cf_silent_@AM_V@) +cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) +cf_silent_0 = --silent +cf_silent_1 = CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd # Common infrastructure for tests -- cgit v1.2.3