Hash :
2d3a2e36
Author :
Date :
2013-05-04T11:50:10
Merge branch 'branch-1.13.2' into maint
* branch-1.13.2:
maint: targets and recipes to simplify testing on real-world packages
build: preparatory refactoring
build: tiny reduction in code duplication
make flags analysis: handle more options with args
make flags analysis: use simpler variable names
make flags analysis: whitespace changes
make flags analysis: embed in a subshell
make flags analysis: be more robust
make flags analysis: cater to GNU make 3.83 (still unreleased as of now)
tests: expose weaknesses in make flags analysis
tests: improve debugging output in checks on make flags analysis
make flags analysis: refactor, to reduce code duplication
tests: avoid one tricky use of "make -e"
tests: avoid a spurious error with Solaris make
subdirs: don't return false positives for the '-k' option's presence
header-vars: recognize more make flags ('-k' in particular)
header-vars: simplify how make flags are determined
tests: remove dead code from t/make-dryrun.tap
header-vars: new variable $(am__running_with_option)
tests: expose bug#12554 (false positives for presence of '-k' make option)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137
#! /bin/sh
# Copyright (C) 2012-2013 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Demo on Libtool/C++ support.
required='libtoolize c++'
am_create_testdir=empty
. test-init.sh
cat > configure.ac << 'END'
AC_INIT([GNU C++/Libtool Demo], [0.73], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR([lib/libfoo.c++])
AC_CONFIG_AUX_DIR([ax])
AM_INIT_AUTOMAKE
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
AC_PROG_CXX
AM_PROG_AR
LT_INIT
AC_CONFIG_FILES([
Makefile
src/Makefile
lib/Makefile
try.sh:try.in
])
AC_OUTPUT
END
mkdir ax lib src
cat > Makefile.am <<'END'
SUBDIRS = lib src
AUTOMAKE_OPTIONS = parallel-tests
TEST_EXTENSIONS = .sh
SH_LOG_COMPILER = $(SHELL) -ex
TESTS = try.sh
.PHONY: test-objs
check-local: test-objs
test-objs:
test -f src/main.$(OBJEXT)
test -f lib/libfoo.lo
END
cat > src/Makefile.am << 'END'
bin_PROGRAMS = zardoz
zardoz_SOURCES = main.cc
zardoz_LDADD = $(top_builddir)/lib/libfoo.la
AM_CPPFLAGS = -I$(top_builddir)/lib
END
cat > lib/Makefile.am << 'END'
lib_LTLIBRARIES = libfoo.la
nodist_libfoo_la_SOURCES = libfoo.h++
libfoo_la_SOURCES = libfoo.c++
libfoo.h++: $(srcdir)/libfoo.c++
echo '#include <string>' >$@-t
grep "target *(" "$(srcdir)/libfoo.c++" >>$@-t
echo ';' >>$@-t
chmod a-w $@-t && mv -f $@-t $@
BUILT_SOURCES = libfoo.h++
DISTCLEANFILES = $(BUILT_SOURCES)
END
cat > try.in << 'END'
#!/bin/sh
set -e
if test x"$host_alias" = x || test x"$build_alias" = x"$host_alias"; then
./src/zardoz
test "`./src/zardoz`" = 'Howdy, Testsuite!'
else
echo "Skip: cannot run a cross-compiled program"
exit 77
fi
END
libtoolize --copy
$ACLOCAL
$AUTOCONF
$AUTOMAKE --add-missing --copy
ls -l . ax # For debugging.
# Ideally, the 'compile' script should not be required by C++ compilers.
# But alas, LT_INIT seems to invoke AC_PROG_CC anyway, and that brings in
# that script.
for f in ltmain.sh depcomp compile config.guess config.sub; do
test -f ax/$f && test ! -h ax/$f || exit 1
done
cat > src/main.cc << 'END'
#include "libfoo.h++"
#include <iostream>
using namespace std;
int main (void)
{
cout << "Howdy, " << target () << "!" << endl;
return 0;
}
END
cat > lib/libfoo.c++ << 'END'
#include "libfoo.h++"
#include <string>
std::string target (void)
{
std::string s1 = "Test";
std::string s2 = "suite";
return (s1 + s2);
}
END
./configure
# Creative quoting and redundant use of eval to avoid spurious
# 'maintainer-check' failures.
eval \$'MAKE CC=false AM_MAKEFLAGS=CC=false'
ls -l . src lib # For debugging.
$MAKE test-objs
VERBOSE=yes $MAKE check-TESTS
grep 'Howdy.*Testsuite' try.log || grep 'Skip:.*cross-compiled' try.log
$MAKE distcheck
: