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