diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2018-11-08 06:49:57 +0100 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2018-11-08 08:33:16 +0100 |
| commit | 05e70adf222c54d9d8ae36716285ad91a1ebb724 (patch) | |
| tree | 5244cf9bedbc24b58ab4af640de12b0c02bdf359 /examples | |
| parent | 7efe0b5da3a1863f05f8a3dc67a0daf224ffa047 (diff) | |
| download | bison-05e70adf222c54d9d8ae36716285ad91a1ebb724.tar.gz | |
build: fix issues in the generated tarball
Reported by Andre da Costa Barros.
https://savannah.gnu.org/patch/?9716
* examples/calc++/local.mk: We no longer generate position.hh and
stack.hh. Leaving them here triggers their concurrent generation,
which fails.
(%C%_calc___CPPFLAGS): Fix the extracted headers in the source tree.
* examples/mfcalc/local.mk (%C%_mfcalc_CPPFLAGS): Ditto.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/calc++/local.mk | 6 | ||||
| -rw-r--r-- | examples/mfcalc/local.mk | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/examples/calc++/local.mk b/examples/calc++/local.mk index 4b31283f..059f2b05 100644 --- a/examples/calc++/local.mk +++ b/examples/calc++/local.mk @@ -57,9 +57,7 @@ extracted += $(calcxx_extracted) calcxx_sources_generated = \ %D%/parser.cc \ %D%/parser.hh \ - %D%/location.hh \ - %D%/position.hh \ - %D%/stack.hh + %D%/location.hh calcxx_sources = \ $(calcxx_sources_extracted) \ $(calcxx_sources_generated) @@ -69,7 +67,7 @@ if ENABLE_CXX check_PROGRAMS += %D%/calc++ nodist_%C%_calc___SOURCES = $(calcxx_sources) # Don't use gnulib's system headers. - %C%_calc___CPPFLAGS = -I$(top_builddir)/%D% + %C%_calc___CPPFLAGS = -I$(top_srcdir)/%D% -I$(top_builddir)/%D% %C%_calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS) TESTS += %D%/calc++.test endif ENABLE_CXX diff --git a/examples/mfcalc/local.mk b/examples/mfcalc/local.mk index 9df3b05e..62923b37 100644 --- a/examples/mfcalc/local.mk +++ b/examples/mfcalc/local.mk @@ -29,7 +29,7 @@ extracted += $(mfcalc_extracted) check_PROGRAMS += %D%/mfcalc nodist_%C%_mfcalc_SOURCES = $(mfcalc_sources) # Don't use gnulib's system headers. -%C%_mfcalc_CPPFLAGS = -I$(top_builddir)/%D% +%C%_mfcalc_CPPFLAGS = -I$(top_srcdir)/%D% -I$(top_builddir)/%D% %C%_mfcalc_LDADD = -lm dist_TESTS += %D%/mfcalc.test |