diff options
author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /client/Makefile.am | |
parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz |
lots of post-merge changes
Diffstat (limited to 'client/Makefile.am')
-rw-r--r-- | client/Makefile.am | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 96e763772dd..97ced5fbfb7 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -63,6 +63,7 @@ mysqlbinlog_SOURCES = mysqlbinlog.cc \ $(top_srcdir)/mysys/my_bit.c \ $(top_srcdir)/mysys/my_bitmap.c \ $(top_srcdir)/mysys/base64.c +mysqlbinlog_CXXFLAGS= -I$(top_srcdir)/sql mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) mysqldump_SOURCES= mysqldump.c \ @@ -102,14 +103,8 @@ DEFS = -DMYSQL_CLIENT_NO_THREADS \ -DDEFAULT_MYSQL_HOME='"$(prefix)"' \ -DMYSQL_DATADIR='"$(localstatedir)"' -sql_src=log_event.h sql_priv.h rpl_constants.h \ - rpl_tblmap.h rpl_tblmap.cc \ - log_event.cc my_decimal.h my_decimal.cc \ - log_event_old.h log_event_old.cc \ - rpl_record_old.h rpl_record_old.cc \ - rpl_utility.h rpl_utility.cc \ - transaction.h sql_const.h \ - sql_list.h rpl_filter.h sql_list.cc rpl_filter.cc +sql_src=rpl_tblmap.cc log_event.cc my_decimal.cc log_event_old.cc \ + rpl_record_old.cc rpl_utility.cc sql_list.cc rpl_filter.cc strings_src=decimal.c dtoa.c link_sources: |