mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
eeee5fb10b
Makefile.am: Auto merged myisam/mi_create.c: Auto merged myisam/mi_open.c: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysys/thr_alarm.c: Auto merged VC++Files/sql/mysqld.dsp: Keep old client/mysqldump.c: Manual merge client/mysqltest.c: Automatic merge configure.in: Manual merge mysql-test/r/ctype_ucs.result: Auto merge mysql-test/r/func_str.result: Auto merge mysql-test/r/group_by.result: Auto merge mysql-test/r/insert_select.result: Auto merge mysql-test/r/insert_update.result: Auto merge mysql-test/r/lowercase_table2.result: Auto merge mysql-test/r/select.result: Manual merge mysql-test/r/variables.result: Auto merge mysql-test/t/ctype_ucs.test: Auto merge mysql-test/t/func_str.test: Auto merge mysql-test/t/group_by.test: Auto merge mysql-test/t/insert_select.test: Auto merge mysql-test/t/insert_update.test: Auto merge mysql-test/t/ndb_alter_table.test: Auto merge mysql-test/t/select.test: Auto merge mysql-test/t/variables.test: Auto merge mysys/my_access.c: Auto merge scripts/make_win_src_distribution.sh: Auto merge sql/field.cc: Manual merge sql/ha_ndbcluster.cc: Auto merge sql/handler.cc: Auto merge sql/item.cc: Auto merge sql/item.h: Manual merge sql/item_cmpfunc.h: Auto merge sql/item_strfunc.cc: Auto merge sql/item_strfunc.h: Auto merge sql/mysql_priv.h: manual merge sql/mysqld.cc: manual merge sql/opt_range.cc: manual merge sql/set_var.cc: Auto merge sql/sql_base.cc: manual merge Restore processing of ON DUPLICATE KEY UPDATE sql/sql_insert.cc: manual merge Restore processing of ON DUPLICATE KEY UPDATE Simplify mysql_prepare_insert by using local variable for select_lex and save old values just before they are changed sql/sql_parse.cc: Restore processing of ON DUPLICATE KEY UPDATE sql/sql_prepare.cc: New ON DUPLICATE KEY UPDATE handling sql/sql_select.cc: manual merge sql/sql_table.cc: auto merge sql/sql_yacc.yy: auto merge strings/ctype-ucs2.c: auto merge strings/ctype-utf8.c: auto merge
112 lines
3.5 KiB
Makefile
112 lines
3.5 KiB
Makefile
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
# Process this file with automake to create Makefile.in
|
|
|
|
AUTOMAKE_OPTIONS = foreign
|
|
|
|
# These are built from source in the Docs directory
|
|
EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
|
|
SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
|
|
@readline_topdir@ sql-common \
|
|
@thread_dirs@ pstack \
|
|
@sql_union_dirs@ scripts @man_dirs@ tests \
|
|
netware @libmysqld_dirs@ \
|
|
@bench_dirs@ support-files @tools_dirs@
|
|
|
|
DIST_SUBDIRS = . include @docs_dirs@ zlib \
|
|
@readline_topdir@ sql-common \
|
|
@thread_dirs@ pstack \
|
|
@sql_union_dirs@ scripts @man_dirs@ tests SSL\
|
|
BUILD netware os2 @libmysqld_dirs@ \
|
|
@bench_dirs@ support-files @tools_dirs@
|
|
|
|
# Relink after clean
|
|
linked_sources = linked_client_sources linked_server_sources \
|
|
linked_libmysql_sources linked_libmysql_r_sources \
|
|
linked_libmysqld_sources linked_libmysqldex_sources \
|
|
linked_include_sources @linked_netware_sources@
|
|
|
|
CLEANFILES = $(linked_sources)
|
|
|
|
# This is just so that the linking is done early.
|
|
all-local: $(linked_sources)
|
|
|
|
linked_include_sources:
|
|
cd include; $(MAKE) link_sources
|
|
echo timestamp > linked_include_sources
|
|
|
|
linked_client_sources: @linked_client_targets@
|
|
cd client; $(MAKE) link_sources
|
|
echo timestamp > linked_client_sources
|
|
|
|
linked_libmysql_sources:
|
|
cd libmysql; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysql_sources
|
|
|
|
linked_libmysql_r_sources: linked_libmysql_sources
|
|
cd libmysql_r; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysql_r_sources
|
|
|
|
linked_libmysqld_sources:
|
|
cd libmysqld; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysqld_sources
|
|
|
|
linked_libmysqldex_sources:
|
|
cd libmysqld/examples; $(MAKE) link_sources
|
|
echo timestamp > linked_libmysqldex_sources
|
|
|
|
linked_netware_sources:
|
|
cd @netware_dir@; $(MAKE) link_sources
|
|
echo timestamp > linked_netware_sources
|
|
|
|
#avoid recursive make calls in sql directory
|
|
linked_server_sources:
|
|
cd sql; rm -f mini_client_errors.c;\
|
|
@LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c;\
|
|
rm -f pack.c;@LN_CP_F@ ../sql-common/pack.c pack.c;\
|
|
rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c;\
|
|
rm -f my_time.c;@LN_CP_F@ ../sql-common/my_time.c my_time.c
|
|
echo timestamp > linked_server_sources
|
|
|
|
# Create permission databases
|
|
init-db: all
|
|
$(top_builddir)/scripts/mysql_install_db
|
|
|
|
bin-dist: all
|
|
$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@
|
|
|
|
# Remove BK's "SCCS" subdirectories from source distribution
|
|
dist-hook:
|
|
rm -rf `find $(distdir) -type d -name SCCS`
|
|
|
|
tags:
|
|
support-files/build-tags
|
|
.PHONY: init-db bin-dist
|
|
|
|
# Test installation
|
|
|
|
test:
|
|
cd mysql-test; \
|
|
./mysql-test-run && ./mysql-test-run --ps-protocol
|
|
|
|
test-force:
|
|
cd mysql-test; \
|
|
./mysql-test-run --force ;\
|
|
./mysql-test-run --ps-protocol --force
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|