diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-11 09:34:02 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-11 09:34:02 +0200 |
| commit | 0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd (patch) | |
| tree | 4ac6f149a3e9c967fd1f3f99f651f4c5d6d6f7de /sql/Makefile.am | |
| parent | 06f4523d79f7c8509c58e6bee4b84c6ead40fbb2 (diff) | |
| parent | c2d2ede33c4c67258676f26f7030ee3d79be5ef2 (diff) | |
| download | mariadb-git-0f299acb7c0e693dc3aa2a98cba5453bcc07d0dd.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
client/Makefile.am:
Merge
netware/Makefile.am:
Merge
sql/Makefile.am:
Merge
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 801020c7e64..5f0b9476c01 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -124,11 +124,11 @@ DEFS = -DMYSQL_SERVER \ @DEFS@ BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.h -BUILT_SOURCES = $(BUILT_MAINT_SRC) lex_hash.h +BUILT_SOURCES = $(BUILT_MAINT_SRC) lex_hash.h link_sources EXTRA_DIST = udf_example.c udf_example.def $(BUILT_MAINT_SRC) \ nt_servc.cc nt_servc.h message.mc CMakeLists.txt \ udf_example.c udf_example.def -CLEANFILES = lex_hash.h sql_yacc.output +CLEANFILES = lex_hash.h sql_yacc.output link_sources DISTCLEANFILES = $(EXTRA_PROGRAMS) MAINTAINERCLEANFILES = $(BUILT_MAINT_SRC) AM_YFLAGS = -d --verbose |