mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 14:02:32 +01:00
f68085c4e7
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Auto merged BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56: Auto merged BitKeeper/deleted/.del-mysys.dsp~32695fee91189326: Auto merged BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Auto merged BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Auto merged BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Auto merged client/mysql.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged dbug/dbug.c: Auto merged extra/perror.c: Auto merged extra/yassl/src/yassl_imp.cpp: Auto merged extra/yassl/src/yassl_int.cpp: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/r/func_compress.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/gis-rtree.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/im_daemon_life_cycle.result: Auto merged mysql-test/r/im_utils.result: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/r/mysqlcheck.result: Auto merged mysql-test/r/rpl_sp.result: Auto merged mysql-test/r/rpl_trigger.result: Auto merged mysql-test/r/sp-code.result: Auto merged mysql-test/r/sp-security.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/im_life_cycle.imtest: Auto merged mysql-test/t/im_utils.imtest: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged mysql-test/t/mysqlcheck.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/rpl_trigger.test: Auto merged mysql-test/t/sp-security.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/udf.test: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/protocol.cc: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_udf.cc: Auto merged sql/sql_view.cc: Auto merged sql/table.cc: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged sql/table.h: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged mysql-test/r/im_life_cycle.result: e use local mysql-test/r/ps.result: use local client/Makefile.am: Manual merge. client/mysqlimport.c: Manual merge. configure.in: Manual merge. mysql-test/mysql-test-run.pl: Manual merge. mysql-test/r/mysqldump.result: Manual merge. mysql-test/r/mysqltest.result: Manual merge. mysql-test/r/ndb_basic.result: Manual merge. mysql-test/r/rpl_view.result: Manual merge. mysql-test/r/show_check.result: Manual merge. mysql-test/r/sp-error.result: Manual merge. mysql-test/r/sp.result: Manual merge. mysql-test/r/union.result: Manual merge. mysql-test/t/mysqldump.test: Manual merge. mysql-test/t/mysqltest.test: Manual merge. mysql-test/t/ndb_basic.test: Manual merge. mysql-test/t/rpl_sp.test: Manual merge. mysql-test/t/rpl_view.test: Manual merge. mysql-test/t/show_check.test: Manual merge. mysql-test/t/sp-error.test: Manual merge. mysql-test/t/sp.test: Manual merge. sql/item_sum.cc: Manual merge. sql/mysql_priv.h: Manual merge. sql/sp_head.cc: Manual merge. sql/sql_db.cc: Manual merge. sql/sql_delete.cc: Manual merge. sql/sql_lex.h: Manual merge. sql/sql_show.cc: Manual merge. sql/sql_table.cc: Manual merge. sql/sql_trigger.cc: Manual merge. sql/sql_yacc.yy: Manual merge. tests/mysql_client_test.c: Manual merge.
96 lines
3.7 KiB
Makefile
96 lines
3.7 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
|
|
|
|
# This file is public domain and comes with NO WARRANTY of any kind
|
|
|
|
if HAVE_YASSL
|
|
yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp
|
|
else
|
|
yassl_dummy_link_fix=
|
|
endif
|
|
|
|
if THREAD_SAFE_CLIENT
|
|
LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql_r/libmysqlclient_r.la
|
|
else
|
|
LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql/libmysqlclient.la
|
|
endif
|
|
|
|
#AUTOMAKE_OPTIONS = nostdinc
|
|
INCLUDES = -I$(top_builddir)/include \
|
|
-I$(top_srcdir)/include \
|
|
-I$(top_srcdir)/regex \
|
|
$(openssl_includes)
|
|
LIBS = @CLIENT_LIBS@
|
|
LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \
|
|
$(top_builddir)/libmysql/libmysqlclient.la
|
|
bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
|
|
mysqldump mysqlimport mysqltest mysqlbinlog \
|
|
mysqlslap mysql_upgrade
|
|
noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
|
|
client_priv.h
|
|
mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc
|
|
mysqladmin_SOURCES = mysqladmin.cc
|
|
mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)
|
|
mysqltest_SOURCES= mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \
|
|
$(yassl_dummy_link_fix)
|
|
mysqltest_LDADD = $(top_builddir)/regex/libregex.a $(LDADD)
|
|
mysqlbinlog_SOURCES = mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \
|
|
$(top_srcdir)/mysys/my_new.cc \
|
|
$(top_srcdir)/mysys/my_bit.c \
|
|
$(top_srcdir)/mysys/my_bitmap.c \
|
|
$(top_srcdir)/mysys/my_vle.c \
|
|
$(top_srcdir)/mysys/base64.c
|
|
mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS)
|
|
mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
|
|
@CLIENT_EXTRA_LDFLAGS@ \
|
|
$(LIBMYSQLCLIENT_LA) \
|
|
$(top_builddir)/mysys/libmysys.a
|
|
mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
|
|
@CLIENT_EXTRA_LDFLAGS@ \
|
|
$(LIBMYSQLCLIENT_LA) \
|
|
$(top_builddir)/mysys/libmysys.a
|
|
mysqlcheck_SOURCES= mysqlcheck.c $(yassl_dummy_link_fix)
|
|
mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix)
|
|
mysqlslap_SOURCES= mysqlslap.c $(yassl_dummy_link_fix)
|
|
mysqldump_SOURCES= mysqldump.c my_user.c \
|
|
$(top_srcdir)/mysys/mf_getdate.c \
|
|
$(yassl_dummy_link_fix)
|
|
mysqlimport_SOURCES= mysqlimport.c $(yassl_dummy_link_fix)
|
|
mysql_upgrade_SOURCES= mysql_upgrade.c $(yassl_dummy_link_fix)
|
|
sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc
|
|
strings_src=decimal.c
|
|
|
|
# Fix for mit-threads
|
|
DEFS = -DUNDEF_THREADS_HACK \
|
|
-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
|
|
-DDATADIR="\"$(localstatedir)\""
|
|
EXTRA_DIST = get_password.c CMakeLists.txt
|
|
|
|
link_sources:
|
|
for f in $(sql_src) ; do \
|
|
rm -f $$f; \
|
|
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
|
|
done; \
|
|
for f in $(strings_src) ; do \
|
|
rm -f $(srcdir)/$$f; \
|
|
@LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
|
|
done; \
|
|
rm -f $(srcdir)/my_user.c; \
|
|
@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
|
|
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|