diff options
Diffstat (limited to 'Build/source/texk/Makefile.in')
| -rw-r--r-- | Build/source/texk/Makefile.in | 77 |
1 files changed, 40 insertions, 37 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in index 6fe11d0a082..ebbdfb3e71b 100644 --- a/Build/source/texk/Makefile.in +++ b/Build/source/texk/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_SUBTEXK = @DIST_SUBTEXK@ 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@ -SUBTEXK = @SUBTEXK@ VERSION = @VERSION@ WARNING_CFLAGS = @WARNING_CFLAGS@ abs_builddir = @abs_builddir@ @@ -391,13 +392,21 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I ../m4 --force -SUBDIRS = . $(SUBTEXK) -DIST_SUBDIRS = $(DIST_SUBTEXK) +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 = texk/ +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 # Common infrastructure for tests EXTRA_DIST = tests @@ -406,7 +415,7 @@ 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*) \ @@ -429,6 +438,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 @@ -861,17 +871,10 @@ uninstall-am: dist-hook: rm -rf `find $(distdir) -name .svn` -all-local: subtexk +all-local: recurse -.PHONY: subtexk -# We must configure all texk 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. -# -# Sequentially configure and optionally build all texk programs; -# code inspired by automake's way to handle recursive targets. -subtexk: $(CONFIG_AUX) +.PHONY: recurse +recurse: $(CONFIG_AUX) @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -879,28 +882,28 @@ subtexk: $(CONFIG_AUX) *k*) failcom='fail=yes';; \ esac; \ done; \ - list='$(DIST_SUBTEXK)'; for subtexk in $$list; do \ - if test ! -f $$subtexk/Makefile; then \ - test -d $$subtexk || $(MKDIR_P) $$subtexk; \ - cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,texk/$$subtexk,g"`; \ - case " $(SUBTEXK) " in \ - *" $$subtexk "*) 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 $$subtexk && echo "=== configuring in $$subtexk (`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 $$subtexk failed"; exit 1; }) && \ + { echo "=== configuring in $$one_dir failed"; exit 1; }) && \ if test "x$$skip" = x; then \ - echo "Making all in $$subtexk" && \ - (cd $$subtexk && $(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 # Special target to run TRIP and TRAP tests and create diffs. @@ -908,7 +911,7 @@ subtexk: $(CONFIG_AUX) triptrap: web2c/Makefile cd web2c && $(MAKE) $(AM_MAKEFLAGS) $@ web2c/Makefile: - $(MAKE) $(AM_MAKEFLAGS) DIST_SUBTEXK=web2c subtexk + $(MAKE) $(AM_MAKEFLAGS) CONF_SUBDIRS=web2c subtexk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. |