diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 10:07:08 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-09-09 10:07:08 +0000 |
| commit | e981cdbd1662ed82436259f1046987c5b7204f1a (patch) | |
| tree | 031a0f1bd753e2495237b10de7d1ff6fe5a1a909 /Build/source/Makefile.in | |
| parent | 3ad3db6624b55ad14658410f68ab6cb878904c7c (diff) | |
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
Diffstat (limited to 'Build/source/Makefile.in')
| -rw-r--r-- | Build/source/Makefile.in | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in index e27bf300142..81c3ee506d8 100644 --- a/Build/source/Makefile.in +++ b/Build/source/Makefile.in @@ -518,7 +518,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I m4 --force info_TEXINFOS = doc/texlive.texi doc_texlive_TEXINFOS = doc/build.texi doc/build-tools AM_DISTCHECK_CONFIGURE_FLAGS = -C @@ -539,10 +538,6 @@ EXTRA_DIST = \ SUBDIRS = . $(MAKE_SUBDIRS) libs utils texk DIST_SUBDIRS = auxdir/auxsub $(CONF_SUBDIRS) libs utils texk -cf_silent = $(cf_silent_@AM_V@) -cf_silent_ = $(cf_silent_@AM_DEFAULT_V@) -cf_silent_0 = --silent -cf_silent_1 = recurse_this = recurse_top = @@ -551,6 +546,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 # Run texlinks here since the binaries won't be there # at install-data, and fmtutil.cnf won't be there at install-exec, |