From b9d2b4bc80748d0a6a7209d0ce5dce97565c83ae Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 4 Dec 2006 17:03:39 +0000 Subject: 2006-12-01 Jim Meyering * configure.ac: Use an automake conditional to indicate when we have access to files outside of the current hierarchy, and when we have the tools (java and javac) to build some generated files. * gen/Makefile.am: Don't use $(abs_srcdir); not needed. (timestamp): Depend on java sources and C++ template files, if we're building in a qpid tree. Use $(JAVA) and $(JAVAC), rather than hard-coding those names. (gen-src.mk) [$(java_sources), $(cxx_templates)]: New rules to generate these lists of file names. * bootstrap: Also generate gen/gen-src.mk. But do that only if we're in a qpid hierarchy. Redirect make's stdout to /dev/null. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@482255 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/bootstrap | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'cpp/bootstrap') diff --git a/cpp/bootstrap b/cpp/bootstrap index fe76a84989..34b16cb16b 100755 --- a/cpp/bootstrap +++ b/cpp/bootstrap @@ -4,10 +4,19 @@ aclocal -I m4 autoheader libtoolize --automake +# If we're building in the qpid tree, we can generate +# some Makefile snippets: + +if test -d ../gentools && test -d ../specs; then + (cd gen && rm -f gen-src.mk + perl -ne '/^(abs_srcdir|if|else|endif|include)\b/ or print' Makefile.am \ + | make -f - abs_srcdir=`pwd` srcdir=. gen-src.mk > /dev/null ) +fi + # Generate (for automake) lots of repetitive parts of tests/Makefile.am. (cd tests && rm -f gen.mk perl -ne '/^include / or print' Makefile.am \ - | make -f - abs_srcdir=`dirname $(pwd)` gen.mk ) + | make -f - abs_srcdir=`dirname $(pwd)` gen.mk > /dev/null ) automake autoconf -- cgit v1.2.1