diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-01-24 14:43:09 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-01-24 14:43:09 -0700 |
| commit | 53491b18009d0c38644896c1bc0c5aecfc6fbf44 (patch) | |
| tree | 561dff8f89d961e8ec7b9484ce861c3712c617c0 /Makefile.am | |
| parent | 5c0216c593566377e2429a54fdab33babc0b70ab (diff) | |
| parent | 39cc6d117bb7dafc0634082399e97c03a44dc1c4 (diff) | |
| download | mariadb-git-53491b18009d0c38644896c1bc0c5aecfc6fbf44.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into weblab.(none):/home/marcsql/TREE/mysql-5.1-21029
Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 21d070a3416..6d435bff85a 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 |