summaryrefslogtreecommitdiff
path: root/Build/source/libs/Makefile.in
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-07 14:29:53 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-07-07 14:29:53 +0000
commit0df6dd4d8aea6edc733de81fb7eec115ea59a36e (patch)
treee2f7056cb53c58c8ef5779450ac468091b2bd86d /Build/source/libs/Makefile.in
parent3675a91dd83af3eaa1c1a12e91af1e6c86f710f8 (diff)
build system: additional Makefile fragments
better handling of dependencies for highly parallel make git-svn-id: svn://tug.org/texlive/trunk@31127 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/Makefile.in')
-rw-r--r--Build/source/libs/Makefile.in75
1 files changed, 39 insertions, 36 deletions
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index 98eb05ee90d..cfa202edea0 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -77,18 +77,19 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) ChangeLog README \
- ../build-aux/compile ../build-aux/config.guess \
- ../build-aux/config.sub ../build-aux/depcomp \
- ../build-aux/install-sh ../build-aux/missing \
- ../build-aux/texinfo.tex ../build-aux/ylwrap \
- ../build-aux/ltmain.sh $(top_srcdir)/../build-aux/compile \
+DIST_COMMON = $(srcdir)/../am/recurse.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) ChangeLog README ../build-aux/compile \
+ ../build-aux/config.guess ../build-aux/config.sub \
+ ../build-aux/depcomp ../build-aux/install-sh \
+ ../build-aux/missing ../build-aux/texinfo.tex \
+ ../build-aux/ylwrap ../build-aux/ltmain.sh \
+ $(top_srcdir)/../build-aux/compile \
$(top_srcdir)/../build-aux/config.guess \
$(top_srcdir)/../build-aux/config.sub \
$(top_srcdir)/../build-aux/install-sh \
$(top_srcdir)/../build-aux/missing
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../m4/kpse-common.m4 \
@@ -303,11 +304,11 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CONF_SUBDIRS = @CONF_SUBDIRS@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
-DIST_SUBLIBS = @DIST_SUBLIBS@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -323,6 +324,7 @@ LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+MAKE_SUBDIRS = @MAKE_SUBDIRS@
MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -336,7 +338,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-SUBLIBS = @SUBLIBS@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
abs_builddir = @abs_builddir@
@@ -391,19 +392,27 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../m4 --force
-SUBDIRS = . $(SUBLIBS)
-DIST_SUBDIRS = $(DIST_SUBLIBS)
+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 =
-CONFIG_AUX = ../subsubdir-conf.cmd
+recurse_this = libs/
+recurse_top = ../
+
+# We must configure all subdirs since 'make dist' needs the Makefile.
+# For those 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.
+# Code inspired by automake's way to handle recursive targets.
+CONFIG_AUX = $(recurse_top)subsubdir-conf.cmd
all: all-recursive
.SUFFIXES:
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../am/recurse.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -426,6 +435,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
+$(srcdir)/../am/recurse.am:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -858,17 +868,10 @@ uninstall-am:
dist-hook:
rm -rf `find $(distdir) -name .svn`
-all-local: sublibs
+all-local: recurse
-.PHONY: sublibs
-# We must configure all libs subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
-# we append '--disable-build' so they can skip tests that would
-# fail because other libraries were not built.
-#
-# Sequentially configure and optionally build all libs subdirs;
-# code inspired by automake's way to handle recursive targets.
-sublibs: $(CONFIG_AUX)
+.PHONY: recurse
+recurse: $(CONFIG_AUX)
@fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -876,28 +879,28 @@ sublibs: $(CONFIG_AUX)
*k*) failcom='fail=yes';; \
esac; \
done; \
- list='$(DIST_SUBLIBS)'; for sublibs in $$list; do \
- if test ! -f $$sublibs/Makefile; then \
- test -d $$sublibs || $(MKDIR_P) $$sublibs; \
- cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,libs/$$sublibs,g"`; \
- case " $(SUBLIBS) " in \
- *" $$sublibs "*) skip=;; \
+ list='$(CONF_SUBDIRS)'; for one_dir in $$list; do \
+ if test ! -f $$one_dir/Makefile; then \
+ test -d $$one_dir || $(MKDIR_P) $$one_dir; \
+ cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,$(recurse_this)$$one_dir,g"`; \
+ case " $(MAKE_SUBDIRS) " in \
+ *" $$one_dir "*) skip=;; \
*) skip=' --disable-build';; \
esac; \
- (cd $$sublibs && echo "=== configuring in $$sublibs (`pwd`)" && \
+ (cd $$one_dir && echo "=== configuring in $$one_dir (`pwd`)" && \
if $(AM_V_P); then echo "make: running $(SHELL) $$cmd$$skip"; fi && \
CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
eval $(SHELL) $$cmd$$skip $(cf_silent) || \
- { echo "=== configuring in $$sublibs failed"; exit 1; }) && \
+ { echo "=== configuring in $$one_dir failed"; exit 1; }) && \
if test "x$$skip" = x; then \
- echo "Making all in $$sublibs" && \
- (cd $$sublibs && $(MAKE) $(AM_MAKEFLAGS) all); \
+ echo "Making all in $$one_dir" && \
+ (cd $$one_dir && $(MAKE) $(AM_MAKEFLAGS) all); \
fi || eval $$failcom; \
fi; \
done; test -z "$$fail"
-../subsubdir-conf.cmd:
- @echo "configure in ../auxdir/auxsub failed to create the file $@"
+$(CONFIG_AUX):
+ @echo "configure in $(recurse_top)auxdir/auxsub failed to create the file $@"
exit 1
# Tell versions [3.59,3.63) of GNU make to not export all variables.