mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 04:13:03 +00:00
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.
This commit is contained in:
1
THANKS
1
THANKS
@@ -9,6 +9,7 @@ Akim Demaille akim@lrde.epita.fr
|
|||||||
Albert Chin-A-Young china@thewrittenword.com
|
Albert Chin-A-Young china@thewrittenword.com
|
||||||
Alexander Belopolsky alexb@rentec.com
|
Alexander Belopolsky alexb@rentec.com
|
||||||
Alexandre Duret-Lutz adl@lrde.epita.fr
|
Alexandre Duret-Lutz adl@lrde.epita.fr
|
||||||
|
Andre da Costa Barros andre.cbarros@yahoo.com
|
||||||
Andreas Schwab schwab@suse.de
|
Andreas Schwab schwab@suse.de
|
||||||
Andrew Suffield asuffield@users.sourceforge.net
|
Andrew Suffield asuffield@users.sourceforge.net
|
||||||
Angelo Borsotti angelo.borsotti@gmail.com
|
Angelo Borsotti angelo.borsotti@gmail.com
|
||||||
|
|||||||
@@ -57,9 +57,7 @@ extracted += $(calcxx_extracted)
|
|||||||
calcxx_sources_generated = \
|
calcxx_sources_generated = \
|
||||||
%D%/parser.cc \
|
%D%/parser.cc \
|
||||||
%D%/parser.hh \
|
%D%/parser.hh \
|
||||||
%D%/location.hh \
|
%D%/location.hh
|
||||||
%D%/position.hh \
|
|
||||||
%D%/stack.hh
|
|
||||||
calcxx_sources = \
|
calcxx_sources = \
|
||||||
$(calcxx_sources_extracted) \
|
$(calcxx_sources_extracted) \
|
||||||
$(calcxx_sources_generated)
|
$(calcxx_sources_generated)
|
||||||
@@ -69,7 +67,7 @@ if ENABLE_CXX
|
|||||||
check_PROGRAMS += %D%/calc++
|
check_PROGRAMS += %D%/calc++
|
||||||
nodist_%C%_calc___SOURCES = $(calcxx_sources)
|
nodist_%C%_calc___SOURCES = $(calcxx_sources)
|
||||||
# Don't use gnulib's system headers.
|
# 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)
|
%C%_calc___CXXFLAGS = $(AM_CXXFLAGS) $(FLEX_SCANNER_CXXFLAGS)
|
||||||
TESTS += %D%/calc++.test
|
TESTS += %D%/calc++.test
|
||||||
endif ENABLE_CXX
|
endif ENABLE_CXX
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ extracted += $(mfcalc_extracted)
|
|||||||
check_PROGRAMS += %D%/mfcalc
|
check_PROGRAMS += %D%/mfcalc
|
||||||
nodist_%C%_mfcalc_SOURCES = $(mfcalc_sources)
|
nodist_%C%_mfcalc_SOURCES = $(mfcalc_sources)
|
||||||
# Don't use gnulib's system headers.
|
# 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
|
%C%_mfcalc_LDADD = -lm
|
||||||
|
|
||||||
dist_TESTS += %D%/mfcalc.test
|
dist_TESTS += %D%/mfcalc.test
|
||||||
|
|||||||
Reference in New Issue
Block a user