diff options
author | Karl Berry <karl@freefriends.org> | 2017-02-17 22:37:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-02-17 22:37:44 +0000 |
commit | 403359433cd5380f66b5eae875fd817afcacc250 (patch) | |
tree | d0a3d303e89af7ec6ec055bedf8b285787680f62 /Build/source/am | |
parent | ab45728245c1e07608202ff15953b97a9d3232b0 (diff) |
do not configure in disabled (with --disable-PKG) subdirs
git-svn-id: svn://tug.org/texlive/trunk@43261 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/am')
-rw-r--r-- | Build/source/am/ChangeLog | 34 | ||||
-rw-r--r-- | Build/source/am/README | 7 | ||||
-rw-r--r-- | Build/source/am/recurse.am | 19 |
3 files changed, 52 insertions, 8 deletions
diff --git a/Build/source/am/ChangeLog b/Build/source/am/ChangeLog new file mode 100644 index 00000000000..6b72cb9fc35 --- /dev/null +++ b/Build/source/am/ChangeLog @@ -0,0 +1,34 @@ +2017-02-17 Karl Berry <karl@freefriends.org> + + * recurse.am: doc fixes. + +2017-02-16 Karl Berry <karl@tug.org> + + * bin_links.am: $(MKDIR_P) $(DESTDIR)$(bindir) to be sure, + since this can end up being called first with --disable-all-pkgs. + +2015-02-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * dist_hook.am (new): Makefile fragment for dist-hook target. + * Makefile.am: Use the fragment dist_hook.am. + +2014-11-17 Karl Berry <karl@tug.org> + + * script_links.am: Use w32_wrapper or w64_wrapper. + +2013-07-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * rebuild.am: Avoid still more 'parallel make' problems. + +2013-07-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * rebuild.am: Avoid more 'parallel make' problems. + +2013-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * *.am: Moved Makefile fragments from libs/ and tekk/. + * rebuild.am: New Makefile fragment to rebuild a library. + * reconfig.am: New Makefile fragment to reconfigure. + * recurse.am: New Makefile fragment to recurse into subdirs. + +(This file public domain.) diff --git a/Build/source/am/README b/Build/source/am/README new file mode 100644 index 00000000000..424899d0ab6 --- /dev/null +++ b/Build/source/am/README @@ -0,0 +1,7 @@ +$Id$ +Public domain. Originally written 2017 by Karl Berry. + +This top-level am/ directory contains fragments which are ultimately used +in Makefile.am files by automake (a.k.a. the top-level reautoconf). + +See also the sibling top-level m4/ directory. diff --git a/Build/source/am/recurse.am b/Build/source/am/recurse.am index 158fb658655..3c6221a93db 100644 --- a/Build/source/am/recurse.am +++ b/Build/source/am/recurse.am @@ -1,16 +1,20 @@ +# $Id$ ## am/recurse.am: Makefile fragment to configure and build subdirs. ## -## Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +## Copyright 2017 Karl Berry <tex-live@tug.org> +## Copyright 2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. -## -## requires $(recurse_this) and $(recurse_top). -## -# We must configure all subdirs since 'make dist' needs the Makefile. -# For those not required for the current set of configure options +# +# Requires $(recurse_this) and $(recurse_top). +# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4). +# +# For subdirs not required for the current set of configure options # we append '--disable-build' so they can skip tests that would # fail because, e.g., some required libraries were not built. +# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.) +# # 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 @@ -52,4 +56,3 @@ recurse: $(CONFIG_AUX) $(CONFIG_AUX): @echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@" exit 1 - |