diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 19:00:58 +0100 |
| commit | 5dec570d7c1e2a39b67503a90d2d7905ac4dbb44 (patch) | |
| tree | d206f4c8848a50899d8d0656e8c8212189365ace /libmysqld | |
| parent | 5138bf4238d4a8850ee364a3adf10dc2687af67c (diff) | |
| parent | 027e34e13b8d0baed51e26be8d4ffd86d9b3b041 (diff) | |
| download | mariadb-git-5dec570d7c1e2a39b67503a90d2d7905ac4dbb44.tar.gz | |
5.1 -> 5.2 merge
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 7605c33021f..f889b7526b7 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -81,7 +81,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ sql_servers.cc event_parse_data.cc opt_table_elimination.cc # automake misses these -sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy +sql_yacc.cc sql_yacc.$(YACC_HEXT): $(top_srcdir)/sql/sql_yacc.yy # The following libraries should be included in libmysqld.a INC_LIB= $(top_builddir)/regex/libregex.la \ |