mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
9ea1d5e293
into zim.(none):/home/brian/mysql/mysql-5.1 Resolved to minor issues. BitKeeper/etc/config: Auto merged Makefile.am: Auto merged VC++Files/sql/mysqld.vcproj: Auto merged extra/perror.c: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/disabled.def: Auto merged mysys/Makefile.am: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged sql/Makefile.am: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/lex.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/examples/ha_tina.cc: Auto merged sql/table.h: Auto merged sql/unireg.h: Auto merged storage/innobase/lock/lock0lock.c: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_search.c: Auto merged storage/myisam/myisamchk.c: Auto merged storage/myisam/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged configure.in: Fixed the resolve of versions. mysql-test/r/alter_table.result: Fixed results.
129 lines
4.2 KiB
Makefile
129 lines
4.2 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 \
|
|
strings mysys dbug extra regex storage \
|
|
vio sql libmysql_r libmysql client scripts \
|
|
@man_dirs@ tests SSL\
|
|
BUILD netware os2 @libmysqld_dirs@\
|
|
@bench_dirs@ support-files server-tools tools
|
|
|
|
# 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 installation. Ports are configurable from the environment.
|
|
|
|
MYSQL_TEST_MANAGER_PORT = 9305
|
|
MYSQL_TEST_MASTER_PORT = 9306
|
|
MYSQL_TEST_SLAVE_PORT = 9308
|
|
MYSQL_TEST_NDB_PORT = 9350
|
|
MYSQL_TEST_RUN_ARGS = --manager-port=$(MYSQL_TEST_MANAGER_PORT) \
|
|
--master_port=$(MYSQL_TEST_MASTER_PORT) \
|
|
--slave_port=$(MYSQL_TEST_SLAVE_PORT) \
|
|
--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)
|
|
test:
|
|
cd mysql-test ; \
|
|
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \
|
|
./mysql-test-run.pl --ps-protocol $(MYSQL_TEST_RUN_ARGS)
|
|
|
|
test-force:
|
|
cd mysql-test ; \
|
|
./mysql-test-run --force $(MYSQL_TEST_RUN_ARGS) ; \
|
|
./mysql-test-run --ps-protocol --force $(MYSQL_TEST_RUN_ARGS)
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|