diff options
author | Akim Demaille <demaille@gostai.com> | 2012-02-13 18:23:45 +0100 |
---|---|---|
committer | Akim Demaille <demaille@gostai.com> | 2012-02-14 21:00:59 +0100 |
commit | 360ae94ebc3f25f93c44ed6e6f65730afa56ff63 (patch) | |
tree | 8f750f3e58e2c2db67071033e35df24f44545da8 /examples/calc++/test | |
parent | 72c12bfa1b675dff82689ace48d09f57b317db74 (diff) | |
download | bison-360ae94ebc3f25f93c44ed6e6f65730afa56ff63.tar.gz |
maint: de-recurse the handling of examples
The directory was still using a local Makefile.am because it provides
"scoped" Make variables: these examples are not meant to use the same
CPPFLAGS etc. If we were to use the same -I set, we'd pick up
gnulib's stdio.h for instance, which we do not want for these simple
examples.
Yet, as a result, the dependencies are less accurate, there is code
duplication, etc. This is especially perceptible when trying to
extract more examples from the documentation, as will be done in
forthcoming changes.
In order to make the tuning of CPPFLAGS easier, discard the predefined
-I from Automake.
* examples/calc++/Makefile.am: Rename as...
* examples/calc++/local.mk: this.
Adjust the paths which are now rooted in top_srcdir/top_builddir.
Handle BISON_CXX_WORKS here, instead of the too crude previous
approach that completely discarded the whole directory.
($(BISON)): Remove now useless bouncing recipe.
(calc___CPPFLAGS): New.
Stay away from -Ilib.
* Makefile.am, configure.ac, examples/local.mk,
* examples/calc++/test: Adjust.
* configure.ac: Pass nostdinc to Automake.
* src/local.mk, lib/local.mk (AM_CPPFLAGS): Move to...
* Makefile.am: here.
* src/local.mk, examples/calc++/Makefile.am (BISON, BISON_IN): Factor
to...
* Makefile.am: here.
* tests/local.mk: Use it.
Diffstat (limited to 'examples/calc++/test')
-rwxr-xr-x | examples/calc++/test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/calc++/test b/examples/calc++/test index 27012239..150f161c 100755 --- a/examples/calc++/test +++ b/examples/calc++/test @@ -37,7 +37,7 @@ run () shift local out_exp=$1 shift - ./calc++ "$@" input >out_eff + ./examples/calc++/calc++ "$@" input >out_eff local sta_eff=$? local out_eff=`cat out_eff` if test $sta_eff -eq $sta_exp; then |