summaryrefslogtreecommitdiff
path: root/qpid/cpp/bootstrap
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2007-04-03 21:56:22 +0000
committerAlan Conway <aconway@apache.org>2007-04-03 21:56:22 +0000
commit820c6f73cecb054fa422f34a0fd98a42b545e5a1 (patch)
treefce10d5bfc0598c78d3bb6c27dff6a8a41bc233e /qpid/cpp/bootstrap
parent7043d22d1943263840eb6cefdb7c6449eeab5a14 (diff)
downloadqpid-python-820c6f73cecb054fa422f34a0fd98a42b545e5a1.tar.gz
* Remove redundant Makefile.am, not needed with single src/ makefile.
* Fixed automake warnings. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@525297 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/bootstrap')
-rwxr-xr-xqpid/cpp/bootstrap4
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/bootstrap b/qpid/cpp/bootstrap
index b956edf70f..55bb6152a1 100755
--- a/qpid/cpp/bootstrap
+++ b/qpid/cpp/bootstrap
@@ -17,9 +17,9 @@ if test -d ../specs; then
# contents of the sole automake-else clause (the warning), then
# use the result to run the rules that create gen-src.mk, a file
# that must be created before we run automake.
- (cd src/gen && rm -f gen-src.mk
+ (cd src && rm -f gen/gen-src.mk
perl -ne '/warning:|^(if|else|endif|include)\b/ or print' Makefile.am \
- | make -f - srcdir=. gen-src.mk > /dev/null )
+ | make -f - srcdir=. gen/gen-src.mk > /dev/null )
fi
# Generate (for automake) lots of repetitive parts of tests/Makefile.am.