From 0fa4924fe544b44739961117e6ccd0cb99cdbe40 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Thu, 18 Jun 2009 13:49:44 +0500 Subject: Fixed build failures. storage/innodb_plugin/Makefile.am: Removed handler0vars.h from source distribution. win/Makefile.am: Fixed incorrect merge. --- storage/innodb_plugin/Makefile.am | 2 +- win/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/storage/innodb_plugin/Makefile.am b/storage/innodb_plugin/Makefile.am index 9f593635088..19c9858a3f3 100644 --- a/storage/innodb_plugin/Makefile.am +++ b/storage/innodb_plugin/Makefile.am @@ -131,7 +131,7 @@ noinst_HEADERS= include/btr0btr.h include/btr0btr.ic \ include/ut0list.ic include/ut0wqueue.h \ include/ha_prototypes.h handler/ha_innodb.h \ include/handler0alter.h \ - handler/i_s.h handler/handler0vars.h + handler/i_s.h EXTRA_LIBRARIES= libinnobase.a noinst_LIBRARIES= @plugin_innodb_plugin_static_target@ diff --git a/win/Makefile.am b/win/Makefile.am index b7721264025..e5813010740 100644 --- a/win/Makefile.am +++ b/win/Makefile.am @@ -16,8 +16,7 @@ ## Process this file with automake to create Makefile.in EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat build-vs9.bat \ build-vs9_x64.bat configure.js README mysql_manifest.cmake \ - create_manifest.js + create_manifest.js create_def_file.js # Don't update the files from bitkeeper %::SCCS/s.% - mysql_manifest.cmake create_manifest.js create_def_file.js -- cgit v1.2.1