From b19e99865ccf3e946ebe59bf09add8e0452904ac Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sat, 29 Jan 2011 18:51:12 +0100 Subject: MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order to be able to build MSI based installer --- sql/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/Makefile.am') diff --git a/sql/Makefile.am b/sql/Makefile.am index 1c3ee09c0d5..899795aa709 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -151,7 +151,7 @@ DEFS = -DMYSQL_SERVER \ BUILT_MAINT_SRC = sql_yacc.cc sql_yacc.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 \ + nt_servc.cc nt_servc.h mysql_install_db.cc mysql_upgrade_service.cc \ message.mc message.h message.rc MSG00001.bin \ CMakeLists.txt -- cgit v1.2.1 From 366ee3c791ca6b5e7688a5138dfe347860772d2a Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sun, 30 Jan 2011 22:27:59 +0100 Subject: Move common functionality (analyze service configuration) into winservice library --- sql/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'sql/Makefile.am') diff --git a/sql/Makefile.am b/sql/Makefile.am index 899795aa709..4d3289c3dfe 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -153,6 +153,7 @@ 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 mysql_install_db.cc mysql_upgrade_service.cc \ message.mc message.h message.rc MSG00001.bin \ + winservice.c winservice.h CMakeLists.txt CLEANFILES = lex_hash.h sql_yacc.output link_sources -- cgit v1.2.1