summaryrefslogtreecommitdiff
path: root/Build/source/utils/Makefile.am
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-10 10:34:20 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-11-10 10:34:20 +0000
commite4cae97633d68af424aef1494462550cef2dadeb (patch)
tree0e82baf23b3900e995c132775fc75213c0984cf4 /Build/source/utils/Makefile.am
parent558303c70cdfd3bc2465cb99c2f8d81a64efcf31 (diff)
towards TL2010: build system
git-svn-id: svn://tug.org/texlive/trunk@15977 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/Makefile.am')
-rw-r--r--Build/source/utils/Makefile.am25
1 files changed, 10 insertions, 15 deletions
diff --git a/Build/source/utils/Makefile.am b/Build/source/utils/Makefile.am
index 33d6ca77614..7402511c59e 100644
--- a/Build/source/utils/Makefile.am
+++ b/Build/source/utils/Makefile.am
@@ -7,17 +7,14 @@
##
ACLOCAL_AMFLAGS = -I ../m4 --force
-SUBDIRS = dummy . $(SUBUTILS)
-DIST_SUBDIRS = dummy $(DIST_SUBUTILS)
+SUBDIRS = . $(SUBUTILS)
+DIST_SUBDIRS = $(DIST_SUBUTILS)
# just in case a subdirectory has added directories
dist-hook:
rm -rf `find $(distdir) -name .svn`
-SUBUTILS_AUX = subutilsdir-configure subutilsdir-conf.args
-noinst_DATA = $(SUBUTILS_AUX)
-
-DISTCLEANFILES = $(noinst_DATA)
+CONFIG_AUX = ../subsubdir-conf.cmd
all-local: subutils
@@ -29,7 +26,7 @@ all-local: subutils
#
# Sequentially configure and optionally build all utils subdirs;
# code inspired by automake's way to handle recursive targets.
-subutils: $(noinst_DATA)
+subutils: $(CONFIG_AUX)
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -40,14 +37,16 @@ subutils: $(noinst_DATA)
list='$(DIST_SUBUTILS)'; for subutils in $$list; do \
if test ! -f $$subutils/Makefile; then \
test -d $$subutils || $(MKDIR_P) $$subutils; \
- cmd=`cat $(SUBUTILS_AUX) | sed "s,SUBUTILSDIR,$$subutils,g"`; \
+ cmd=`cat $(CONFIG_AUX) | sed "s,auxdir/auxsub,utils/$$subutils,g"`; \
case " $(SUBUTILS) " in \
*" $$subutils "*) skip=;; \
*) skip=' --disable-build';; \
esac; \
(cd $$subutils && echo "=== configuring in $$subutils (`pwd`)" && \
echo "make: running $(SHELL) $$cmd$$skip" && \
- eval $(SHELL) $$cmd$$skip) && \
+ CONFIG_SHELL=$(SHELL) && export CONFIG_SHELL && \
+ eval $(SHELL) $$cmd$$skip || \
+ { echo "=== configuring in $$subutils failed"; exit 1; }) && \
if test "x$$skip" = x; then \
echo "Making all in $$subutils" && \
(cd $$subutils && $(MAKE) $(AM_MAKEFLAGS) all); \
@@ -55,11 +54,7 @@ subutils: $(noinst_DATA)
fi; \
done; test -z "$$fail"
-subutilsdir-configure:
- @echo "make in ./dummy failed to create the file $@"
- exit 1
-
-subutilsdir-conf.args:
- @echo "configure in ./dummy failed to create the file $@"
+../subsubdir-conf.cmd:
+ @echo "configure in ../auxdir/auxsub failed to create the file $@"
exit 1