diff options
author | unknown <malff/marcsql@weblab.(none)> | 2007-01-24 14:40:39 -0700 |
---|---|---|
committer | unknown <malff/marcsql@weblab.(none)> | 2007-01-24 14:40:39 -0700 |
commit | 39cc6d117bb7dafc0634082399e97c03a44dc1c4 (patch) | |
tree | 6c2570b265cf13754ed7b8941658cb8eba65a04f /Makefile.am | |
parent | 5ed3d05e4078032f44d74c116919d2a0ec4aa550 (diff) | |
download | mariadb-git-39cc6d117bb7dafc0634082399e97c03a44dc1c4.tar.gz |
Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected)
The build scripts in general, using automake, autoconf, etc, contain several
special commands and work around all related to the way the bison code in the
parser is built, for sql/sql_yacc.yy. These work arounds, accumulated over
time during development, ultimately cause the build scripts to be unstable
and cause build defects by not enforcing dependencies.
This fix simplifies the build process and aligns it with the automake tooling,
which provides native support for bison and *.yy files.
In particular, the following problem have been fixed:
- dependencies with sql_yacc.cc were not honored (Bug 21029), leading to
corrupted builds,
- the work around introduced by Bug 24557, to cleanup the generated files
sql_yacc.h and sql_yacc.cc, has been removed,
- the generated makefile, in a source distribution, used to destroy the files
sql_yacc.h and sql_yacc.cc on a 'make clean' target. This has been fixed:
these files are now removed by make maintainer-clean.
- The root cause of the problem found with gcc 4.1 (see Bug 24619) has been
clearly documented, and the "sed" hack has been replaced by a cleaner
work around, when building the code with bison 1.875.
- Removed the file sql/sql_yacc.yy.bak, added by WL 3031 by accident.
- Removed the unnecessary AM_YFLAG= --debug introduced by WL 3432, since
the compiling option DBUG_OFF takes precedence when setting YYDEBUG.
BitKeeper/deleted/.del-sql_yacc.yy.bak:
Rename: sql/sql_yacc.yy.bak -> BitKeeper/deleted/.del-sql_yacc.yy.bak
Makefile.am:
General cleanup of the build process for sql_yacc.yy
sql/Makefile.am:
General cleanup of the build process for sql_yacc.yy
sql/sql_yacc.yy:
General cleanup of the build process for sql_yacc.yy
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 7c80ea24326..74e8b041d23 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,14 +41,6 @@ BUILT_SOURCES = linked_client_sources linked_server_sources \ CLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = ac_available_languages_fragment -# Our current filtering of "sql_yacc.cc" in "sql/Makefile.am" creates -# a problem, if a VPATH build and "sql_yacc.cc" was part of the source -# distribution we end up with one "sql_yacc.cc" in the source tree, -# and one in the build tree. This breaks "distcleancheck", until this -# is sorted out we redefine the find that scans for files not removed - -distcleancheck_listfiles = find . -name sql_yacc.cc -o -type f -print - linked_include_sources: cd include; $(MAKE) link_sources echo timestamp > linked_include_sources |